From 9b6e710429c0d25d593d72b888525bf3b159a65b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:34:31 +0200 Subject: [PATCH 01/30] Update module github.com/Azure/azure-sdk-for-go/sdk/storage/azblob to v1.4.0 (#34212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/Azure/azure-sdk-for-go/sdk/storage/azblob](https://togithub.com/Azure/azure-sdk-for-go) | `v1.3.2` -> `v1.4.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fAzure%2fazure-sdk-for-go%2fsdk%2fstorage%2fazblob/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fAzure%2fazure-sdk-for-go%2fsdk%2fstorage%2fazblob/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fAzure%2fazure-sdk-for-go%2fsdk%2fstorage%2fazblob/v1.3.2/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fAzure%2fazure-sdk-for-go%2fsdk%2fstorage%2fazblob/v1.3.2/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 8 ++++---- receiver/azureblobreceiver/go.mod | 2 +- receiver/azureblobreceiver/go.sum | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 851bc13d371b..a4fb14466145 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -274,7 +274,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor v0.11.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 // indirect + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 // indirect github.com/Azure/azure-storage-queue-go v0.0.0-20230531184854-c06a8eff66fe // indirect github.com/Azure/go-amqp v1.0.5 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 31d2bb05f591..62c4ceb64ebd 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -670,14 +670,14 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0/go.mod h1:Y/HgrePTmGy9HjdSGTqZNa+apUpTVIEVKXJyARP2lrk= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0 h1:Dd+RhdJn0OTtVGaeDLZpcumkIVCtA/3/Fo42+eoYvVM= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0/go.mod h1:5kakwfW5CjC9KK+Q4wjXAg+ShuIm2mBMua0ZFj2C8PE= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1 h1:MyVTgWR8qd/Jw1Le0NZebGBUCLbtak3bJ3z1OlqZBpw= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occbWoio4EBLkbkevetNMAVX197GkzbUMtqjGWn80= github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 h1:Be6KInmFEKV81c0pOAEbRYehLMwmmGI1exuFj248AMk= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0/go.mod h1:WCPBHsOXfBVnivScjs2ypRfimjEW0qPVLGgJkZlrIOA= github.com/Azure/azure-storage-queue-go v0.0.0-20230531184854-c06a8eff66fe h1:HGuouUM1533rBXmMtR7qh5pYNSSjUZG90b/MgJAnb/A= github.com/Azure/azure-storage-queue-go v0.0.0-20230531184854-c06a8eff66fe/go.mod h1:K6am8mT+5iFXgingS9LUc7TmbsW6XBw3nxaRyaMyWc8= github.com/Azure/go-amqp v1.0.5 h1:po5+ljlcNSU8xtapHTe8gIc8yHxCzC03E8afH2g1ftU= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 616ee6f9be49..ea46b898362a 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-event-hubs-go/v3 v3.6.2 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 - github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 + github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.105.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 390832343838..4372db826ab5 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -11,10 +11,10 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY= github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0 h1:AifHbc4mg0x9zW52WOpKbsHaDKuRhlI7TVl47thgQ70= -github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.5.0/go.mod h1:T5RfihdXtBDxt1Ch2wobif3TvzTdumDy29kahv6AV9A= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2 h1:YUUxeiOWgdAQE3pXt2H7QXzZs0q8UBjgRbl56qo8GYM= -github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2/go.mod h1:dmXQgZuiSubAecswZE+Sm8jkvEa7kQgTPVRvwL/nd0E= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 h1:PiSrjRPpkQNjrM8H0WwKMnZUdu1RGMtd/LdGKUrOo+c= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0/go.mod h1:oDrbWx4ewMylP7xHivfgixbfGBT6APAwsSoHRKotnIc= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0 h1:Be6KInmFEKV81c0pOAEbRYehLMwmmGI1exuFj248AMk= +github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0/go.mod h1:WCPBHsOXfBVnivScjs2ypRfimjEW0qPVLGgJkZlrIOA= github.com/Azure/go-amqp v1.0.2 h1:zHCHId+kKC7fO8IkwyZJnWMvtRXhYC0VJtD0GYkHc6M= github.com/Azure/go-amqp v1.0.2/go.mod h1:vZAogwdrkbyK3Mla8m/CxSc/aKdnTZ4IbPxl51Y5WZE= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= From d64ba083d4a1f20e7d044f7ca2fa156b0c0fc575 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 12:37:13 +0200 Subject: [PATCH 02/30] Update module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata to v0.105.0 (#34215) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.0.0-00010101000000-000000000000` -> `v0.105.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2fexperimentalmetricmetadata/v0.105.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2fexperimentalmetricmetadata/v0.105.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2fexperimentalmetricmetadata/v0.0.0-00010101000000-000000000000/v0.105.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2fpkg%2fexperimentalmetricmetadata/v0.0.0-00010101000000-000000000000/v0.105.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
open-telemetry/opentelemetry-collector-contrib (github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata) ### [`v0.105.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01050) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.104.0...v0.105.0) ##### 🛑 Breaking changes 🛑 - `skywalkingexporter`: Remove unmaintained component ([#​23796](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/23796)) - `elasticsearchexporter`: Make "dedup" option no-op, always de-duplicate. ([#​33773](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33773)) Elasticsearch does not permit duplicate keys in JSON objects, so there is no value in being able to configure deduplication. - `elasticsearchexporter`: Remove defunct "file" and "fields" configuration settings. ([#​33803](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33803)) This is a breaking change only because removing the attributes would prevent collector startup if those attributes are specified, but otherwise there is no functional change. These configuration attributes have never done anything. - `stanza`: errors from Operator.Process are returned instead of silently ignored. ([#​33783](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33783)) This public function is affected: https://pkg.go.dev/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza@v0.104.0/operator/helper#WriterOperator.Write - `vcenterreceiver`: Enables various vCenter metrics that were disabled by default until v0.105 ([#​34022](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34022)) The following metrics will be enabled by default "vcenter.host.network.packet.drop.rate", "vcenter.vm.cpu.readiness", "vcenter.host.cpu.capacity", and "vcenter.host.cpu.reserved". ##### 🚩 Deprecations 🚩 - `lokiexporter`: Deprecate component ([#​33916](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33916)) ##### 🚀 New components 🚀 - `sumconnector`: creates a wireframe and initial pr to develop from ([#​32669](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32669)) - `extensions/observer/cfgardenobserver`: Add a new observer that discovers containers through the Garden API ([#​33618](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33618)) ##### 💡 Enhancements 💡 - `pkg/ottl`: Added Hex() converter function ([#​31929](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31929)) - `pkg/ottl`: Add IsRootSpan() converter function. ([#​32918](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32918)) Converter `IsRootSpan()` returns `true` if the span in the corresponding context is root, that means its `parent_span_id` equals to hexadecimal representation of zero. In all other scenarios function returns `false`. - `vcenterreceiver`: Adds additional vCenter resource pool metrics and a memory_usage_type attribute for vcenter.resource_pool.memory.usage metric to use. ([#​33607](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33607)) Added "vcenter.resource_pool.memory.swapped", "vcenter.resource_pool.memory.ballooned", and "vcenter.resource_pool.memory.granted" metrics. Also added an additional attribute, "memory_usage_type" for "vcenter.resource_pool.memory.usage" metric, which is currently under a feature gate. - `kubeletstatsreceiver`: Add `k8s.pod.memory.node.utilization` and `k8s.container.memory.node.utilization` metrics ([#​33591](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33591)) - `vcenterreceiver`: Adds vCenter metrics at the datacenter level. ([#​33607](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33607)) Introduces various datacenter metrics which work by aggregating stats from datastores, clusters, hosts, and VM's. - `processor/resource, processor/attributes`: Add an option to extract value from a client address by specifying `client.address` value in the `from_context` field. ([#​34051](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34051)) - `awss3receiver`: Add support for retrieving logs and metrics to the AWS S3 Receiver. ([#​30750](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30750)) - `receiver/azuremonitorreceiver`: Add support for Managed Identity and Default Credential auth ([#​31268](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31268), [#​33584](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33584)) - `azuremonitorreceiver`: Add `maximum_number_of_records_per_resource` config parameter in order to overwrite default ([#​32165](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32165)) - `clickhouseexporter`: Upgrading stability for logs to beta ([#​33615](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33615)) The logs exporter has been proven to be stable for large scale production deployments. Configuration options specific to logs are unlikely to change. - `cloudfoundryreceiver`: Add support to receive CloudFoundry Logs ([#​32671](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32671)) - `datadogreceiver`: Add support for metrics in Datadog receiver ([#​18278](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/18278)) - `datadogexporter`: Add a feature gate `exporter.datadogexporter.TraceExportUseCustomHTTPClient` that allows a custom HTTP client to be used in trace export ([#​34025](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34025)) This is an experimental feature. By default the feature gate is disabled and trace export uses a default HTTP client. - `elasticsearchexporter`: Introduce experimental `telemetry.log_request_body` and `telemetry.log_response_body` config ([#​33854](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33854)) - `cmd/opampsupervisor`: Adds support for forwarding custom messages to/from the agent ([#​33575](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33575)) - `geoipprocessor`: Add providers configuration and maxmind provider factory ([#​33269](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33269)) - `healthcheckv2extension`: Add partial gRPC service implementation to healthcheckv2. ([#​26661](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26661)) - `healthcheckv2extension`: Add support for streaming Watch RPC to healthcheckv2 gRPC service. ([#​26661](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26661)) - `healthcheckv2extension`: Add HTTP service to healthcheckv2 ([#​26661](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26661)) - `splunkhecexporter`: Increase the performance of JSON marshaling ([#​34011](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34011)) - `pkg/stanza`: Add `parse_ints` config in json parser to support parsing int or float properly ([#​33696](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33696)) - `loadbalancingexporter`: Adds a new streamID routingKey, which will route based on the datapoint ID. See updated README for details ([#​32513](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32513)) - `awsxrayexporter`: Allow multiple log group names/arns to be set in environmental variables ([#​33795](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33795)) - `dockerobserver`: Add hint to error when using float for `api_version` field ([#​34043](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34043)) - `dockerstatsreceiver`: Add hint to error when using float for `api_version` field ([#​34043](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34043)) - `pkg/ottl`: Emit traces for statement sequence executions to troubleshoot OTTL statements/conditions ([#​33433](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33433)) - `pkg/stanza`: Bump 'logs.jsonParserArray' and 'logs.assignKeys' feature gates to beta. ([#​33948](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33948)) This enables the feature gates by default to allow use of the `json_array_parser` and `assign_keys` operations. - `receiver/filelog`: Add filelog.container.removeOriginalTimeField feature-flag for removing original time field ([#​33946](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33946)) - `statsdreceiver`: Allow configuring summary percentiles ([#​33701](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33701)) - `pkg/stanza`: Switch to faster json parser lib for container operator ([#​33929](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33929)) - `telemetrygen`: telemetrygen `--rate` flag changed from Int64 to Float64 ([#​33984](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33984)) - `extension/opamp`: Rely on the Collector APIs to do config redaction ([#​34078](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34078)) Previously all config fields had to be redacted, now `configopaque.String` is used to determine which fields should be redacted. As a result, fields that are not sensitive are no longer redacted. - `azuremonitorreceiver`: Upgrade stability to alpha ([#​33689](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33689)) - `windowsperfcountersreceiver`: `windowsperfcountersreceiver` now appends an index number to additional instance names that share a name. An example of this is when scraping `
rocess(*)` counters with multiple running instances of the same executable. ([#​32319](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32319)) **NOTES** - This change can expose cardinality issues where the counters were previously collapsed under the non-indexed instance name. - The change mimics Windows Performance Monitor behavior: The first instance name remains unchanged, additional instances are suffixed with `#` where `N=1` and is increased for each duplicate. - e.g. Given 3 powershell instances, this will return `powershell`, `powershell#1` and `powershell#2`. ##### 🧰 Bug fixes 🧰 - `servicegraphconnector`: Fix failed label does not work leads to servicegraph metrics error ([#​32018](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32018)) - `apachesparkreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33906](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33906)) - `azureblobreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33902](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33902)) - `countconnector`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33903](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33903)) - `deltatorateprocessor`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33904](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33904)) - `httpcheckreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33897](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33897)) - `metricsgenerationprocessor`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33905](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33905)) - `podmanreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33899](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33899)) - `purefareceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33901](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33901)) - `purefbreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33900](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33900)) - `zookeeperreceiver`: Updating the stability to reflect that the component is shipped as part of contrib. ([#​33898](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33898)) - `probabilisticsamplerprocessor`: Fix bug where log sampling was being reported by the counter `otelcol_processor_probabilistic_sampler_count_traces_sampled` ([#​33874](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33874)) - `cmd/telemetrygen`: Fix `make docker-telemetrygen` command. ([#​33989](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33989)) - `processor/groupbyattrsprocessor`: Fix dropping of metadata fields when processing metrics. ([#​33419](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33419)) - `testbed`: Fixes incorrect count for sent data items in load generator. ([#​34057](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34057)) - `prometheusreceiver`: Fix hash computation to include non exported fields like regex in scrape configuration for TargetAllocator ([#​29313](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29313)) - `datadogexporter`: Exit when API key validation fails and `api::fail_on_invalid_key` is set to `true`. ([#​33935](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33935)) - `kafkametricsreceiver`: Fix issue with incorrect consumer offset ([#​33309](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33309)) - `sqlserverreceiver`: Enable default metrics to properly trigger SQL Server scrape ([#​34065](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/34065)) - `syslogreceiver`: Allow to define `max_octets` for octet counting RFC5424 syslog parser ([#​33182](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33182)) - `windowsperfcountersreceiver`: Metric definitions with no matching performance counter are no longer included as metrics with zero datapoints in the scrape output. ([#​4972](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/4972)) ### [`v0.104.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01040) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.103.0...v0.104.0) ##### 🛑 Breaking changes 🛑 - `sumologicexporter`: removed compress_encoding ([#​33604](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33604)) - `exporter/clickhouse`: Change behavior of how default database is read from the config ([#​33693](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33693)) Changed the default `database` to `default`. The final database will prioritize `endpoint`, unless `database` is set to a value not equal to `default`. If neither are specified then it defaults to the `default` database. Possible breaking change if someone has the DSN configured in combination with `database` config option. - `exporter/clickhouse`: Add `async_insert` config option to enable inserting asynchronously by default. ([#​33614](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33614)) Adds `async_insert` config option to enable inserting asynchronously by default. To preserve the previous behavior, set `async_insert` to `false` in your config. When enabled, the exporter will insert asynchronously, which can improve performance for high-throughput deployments. The `async_insert` option can be set to `true` or `false` to enable or disable async inserts, respectively. The default value is `true`. Keep in mind this setting is added since the exporter now sets it to default. Async insert and its related settings can still be defined in `endpoint` and `connection_params`, which take priority over the new config option. - `clickhouseexporter`: Add `AggregationTemporality` column to histogram and exponential histogram tables. Rename `AggTemp` column to `AggregationTemporality` in sum table. ([#​33424](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33424)) It's a breaking change. users who upgrade to the latest version need to alter the Clickhouse table: ```sql ALTER TABLE otel_metrics_exponential_histogram ADD COLUMN AggregationTemporality Int32 CODEC(ZSTD(1)); ALTER TABLE otel_metrics_histogram ADD COLUMN AggregationTemporality Int32 CODEC(ZSTD(1)); ALTER TABLE otel_metrics_sum RENAME COLUMN AggTemp TO AggregationTemporality; ``` - `exporter/clickhouse`: Remove deprecated `ttl_days` config option, use `ttl` instead. ([#​33648](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33648)) - `vcenterreceiver`: Drops support for vCenter 6.7 ([#​33607](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33607)) - `all`: Promote `component.UseLocalHostAsDefaultHost` feature gate to beta. This changes default endpoints from 0.0.0.0 to localhost ([#​30702](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30702)) This change affects the following components: - extension/awsproxy - extension/health_check - extension/health_checkv2 - extension/jaegerremotesampling - internal/aws/proxy - processor/remotetap - receiver/awsfirehose - receiver/awsxray - receiver/influxdb - receiver/jaeger - receiver/loki - receiver/opencensus - receiver/sapm - receiver/signalfx - receiver/skywalking - receiver/splunk_hec - receiver/zipkin - receiver/zookeeper - `receiver/mongodb`: Graduate receiver.mongodb.removeDatabaseAttr feature gate to stable ([#​24972](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24972)) ##### 🚩 Deprecations 🚩 - `exporter/elasticsearch`: Deprecate the "dedot" configuration. ([#​33772](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33772)) dedot has been deprecated, and will always be enabled in ECS mode and disabled for other modes in future - `exporter/elasticsearch`: Deprecate the "dedup" configuration. ([#​33773](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33773)) dedup has been deprecated, and will always be enabled in future. ##### 🚀 New components 🚀 - `otelarrow`: OTel-Arrow exporter and receiver are marked alpha, added to otelcontribcol ([#​26491](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26491)) ##### 💡 Enhancements 💡 - `exporter/elasticsearch`: Add initial support for metrics ([#​33513](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33513)) - `elasticsearchexporter`: Add translation for k8s.deployment.name resource attribute ([#​33622](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33622)) - `k8sattributesprocessor`: Add support for exposing `k8s.pod.ip` as a resource attribute ([#​32960](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32960)) - `geoipprocessor`: Add MaxMind geoip provider for GeoIP2-City and GeoLite2-City databases. ([#​32663](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32663)) - `vcenterreceiver`: Adds vCenter CPU readiness metric for VMs. ([#​33607](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33607)) - `awsemfexporter`: AWS EMF Exporter to add AppSignals metadata flag into the user-agent ([#​32998](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32998)) - `receiver/mongodb`: Ensure support of 6.0 and 7.0 MongoDB versions with integration tests ([#​32716](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32716)) - `sumologicexporter`: added timeout validation ([#​33151](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33151)) - `clickhouseexporter`: Updated the default logs table to a more optimized schema ([#​33611](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33611)) Simplified data types, improved partitioning and time range queries. - `datadogconnector`: Add a feature gate `connector.datadogconnector.NativeIngest` that enables datadog connector to use the new native OTel API in APM stats computation. ([#​33297](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33297)) The feature gate `connector.datadogconnector.NativeIngest` is disabled by default. - `datadogexporter`: Adds Kubernetes DD tags to keep when mapping resource attributes ([#​33728](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33728)) [https://github.com/DataDog/opentelemetry-mapping-go/pull/334](https://togithub.com/DataDog/opentelemetry-mapping-go/pull/334)/334 for details. - `exporter/elasticsearch`: Add data stream routing ([#​33794](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33794), [#​33756](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33756)) `data_stream.dataset` and `data_stream.namespace` in attributes will be respected when config `*_dynamic_index.enabled` is true. - `exporter/elasticsearch`: Encode metrics resource attributes in ECS mapping mode ([#​33823](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33823)) - `elasticsearchexporter`: Preserve `host.name` resource attribute in ECS mode ([#​33670](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33670)) - `servicegraphprocessor`: Added a new configuration option `enable_virtual_node_label` to allow users to identify which node is the virtual node in each edge of the service graph. ([#​31889](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31889)) - `pkg/stanza`: Switch JSON parser used by json_parser to github.com/goccy/go-json ([#​33784](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33784)) - `k8sobserver`: Add support for k8s.ingress endpoint. ([#​32971](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32971)) - `statsdreceiver`: Optimize statsdreceiver to reduce object allocations ([#​33683](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33683)) - `routingprocessor`: Use mdatagen to define the component's telemetry ([#​33526](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33526)) - `loadbalancerexporter`: Refactors how the load balancing exporter splits metrics ([#​32513](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32513)) All splitting is *behaviorally*, the same. However, the `resource` routingID now uses the `internal/exp/metrics/identity` package to generate the load balancing key, instead of bespoke code. This means that when upgrading to this version your routes for specific metric groupings could change. However, this will be stable and all future metrics will follow the new routing - `receiver/mongodbreceiver`: Add `server.address` and `server.port` resource attributes to MongoDB receiver. ([#​32810](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32810), [#​32350](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32350)) The new resource attributes are added to the MongoDB receiver to distinguish metrics coming from different MongoDB instances. - `server.address`: The address of the MongoDB host, enabled by default. - `server.port`: The port of the MongoDB host, disabled by default. - `observerextension`: Expose host and port in endpoint's environment ([#​33571](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33571)) - `rabbitmqexporter`: Promote rabbitmqexporter to alpha. ([#​33331](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33331)) - `pkg/ottl`: Add a `schema_url` field to access the SchemaURL in resources and scopes on all signals ([#​30229](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30229)) - `solacereceiver`: Renamed some SemConv fields to support latest semantic conventions for messaging spans (version `1.25.0`) ([#​33499](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33499)) - `sqlserverreceiver`: Enable more perf counter metrics when directly connecting to SQL Server ([#​33420](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33420)) This enables the following metrics by default on non Windows-based systems: `sqlserver.batch.request.rate` `sqlserver.batch.sql_compilation.rate` `sqlserver.batch.sql_recompilation.rate` `sqlserver.page.buffer_cache.hit_ratio` `sqlserver.user.connection.count` - `extension/googleclientauth`: Add Google-signed ID token support ([#​33185](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33185)) Update github.com/GoogleCloudPlatform/opentelemetry-operations-go/extension/googleclientauth to v0.48.0. With this update, extension/googleclientauth now supports Google-signed ID token as auth header. - `vcenterreceiver`: Adds vCenter CPU capacity and network drop rate metrics to hosts. ([#​33607](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33607)) ##### 🧰 Bug fixes 🧰 - `resourcedetectionprocessor`: Fetch CPU info only if related attributes are enabled ([#​33774](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33774)) - `datasetexporter`: Upgrade dataset-go to v0.19.0 and fix found issues ([#​33498](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33498), [#​32533](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32533), [#​33675](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33675)) Upgrade `dataset-go` library from v0.18.0 to v0.19.0. Enable skipped integration test and adjust the test so it is passing again. Do not validate configuration, let the framework run the validation. - `datasetexporter`: Upgrade dataset-go to v0.20.0 ([#​33812](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33812)) Upgrade `dataset-go` library from v0.19.0 to v0.20.0. Make number of outgoing connections configurable. - `datadogexporter`: Fix panics on invalid sized trace & span IDs ([#​33566](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33566)) [https://github.com/DataDog/opentelemetry-mapping-go/pull/340](https://togithub.com/DataDog/opentelemetry-mapping-go/pull/340)/340 for details. - `datadogexporter`: Ignore metric datapoints with `no recorded value` flag ([#​33728](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33728)) This flag is not supported by Datadog, so we just ignore these datapoints. [https://github.com/DataDog/opentelemetry-mapping-go/pull/330](https://togithub.com/DataDog/opentelemetry-mapping-go/pull/330)/330 for details. - `tailsamplingprocessor`: Fix precedence of inverted match in and policy ([#​33671](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33671)) Previously if the decision from a policy evaluation was `NotSampled` or `InvertNotSampled` it would return a `NotSampled` decision regardless, effectively downgrading the result. This was breaking the documented behaviour that inverted decisions should take precedence over all others. - `otelarrowreceiver`: Ensure consume operations are not canceled at stream EOF. ([#​33570](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33570)) - `vcenterreceiver`: Fixes errors in some of the client calls for environments containing multiple datacenters. ([#​33734](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33734)) ### [`v0.103.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01030) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.102.0...v0.103.0) ##### 🛑 Breaking changes 🛑 - `cmd/opampsupervisor,extension/opamp`: Upgrade the opamp-go library to v0.15.0 ([#​33416](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33416)) With this change, UUIDv7 is recommended for the OpAMP extension's instance_uid field instead of ULID. ULIDs will continue to work, but may be displayed as UUIDs. The supervisor's persistent state (${storage_dir}/persistent_state.yaml) will need to be cleared to generate a new UUIDv7 instead of a ULID. This change may be incompatible with management servers using v0.14.0 of opamp-go. - `mongodbreceiver`: Now only supports `TCP` connections ([#​32199](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32199)) This fixes a bug where hosts had to explicitly set `tcp` as the transport type. The `transport` option has been removed. - `cmd/configschema`: Removes the deprecated `configschema` command. This command will no longer be released or supported. ([#​33384](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33384)) - `sqlserverreceiver`: sqlserver.database.io.read_latency has been renamed to sqlserver.database.latency with a `direction` attribute. ([#​29865](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29865)) ##### 🚩 Deprecations 🚩 - `healthcheckextension`: Remove incorrect logic behind `check_collector_pipeline` config ([#​33469](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33469)) This logic incorrectly set the pipeline to OK after waiting for enough callbacks from the opencensus library to be called. As this was broken, I'm removing it to remove the dependency on opencensus as well. Improvements will be available via healthcheckv2 extension. - `googlecloudspannerreceiver`: Mark the component as unmaintained. If we don't find new maintainers, it will be deprecated and removed. ([#​32651](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32651)) ##### 💡 Enhancements 💡 - `filelogreceiver`: If include_file_record_number is true, it will add the file record number as the attribute `log.file.record_number` ([#​33530](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33530)) - `kubeletstats`: Add k8s.pod.cpu.node.utilization metric ([#​33390](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33390)) - `awss3exporter`: endpoint should contain the S3 bucket ([#​32774](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32774)) - `awss3receiver`: Add support for encoding extensions to be used in the AWS S3 Receiver. ([#​30750](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30750)) - `gitproviderreceiver`: Adds branch commit and line based metrics ([#​22028](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/22028)) Adds the following branch based metrics. - git.repository.branch.time - git.repository.branch.commit.aheadby.count - git.repository.branch.commit.behindby.count - git.repository.branch.line.deletion.count - git.repository.branch.line.addition.count - `statsdreceiver`: update statsd receiver to use mdatagen ([#​33524](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33524)) - `coralogixexporter`: Allow setting application name from `cx.application.name` and `cx.subsystem.name` resource attributes ([#​33217](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33217)) - `metricstransformprocessor`: Adds the 'count' aggregation type to the Metrics Transform Processor. ([#​24978](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24978)) - `elasticsearchexporter`: Add support for confighttp options, notably "auth". ([#​33367](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33367)) Add support for confighttp and related configuration settings, such as "auth". This change also means that the Elasticsearch URL may be specified as "endpoint", like the otlphttp exporter. - `elasticsearchexporter`: Check that endpoints are valid URLs during config validation. ([#​33350](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33350)) Check that endpoints are valid URLs during config validation so that an invalid endpoint causes a fatal error during startup, rather than leading to a persistent runtime error. - `opampsupervisor`: Add config validation for the supervisor config ([#​32843](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32843)) - `statsdreceiver`: Added received/accepted/refused metrics ([#​24278](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24278)) - `filelogreceiver`: Add support for gzip compressed log files ([#​2328](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/2328)) - `confmap/provider/secretsmanagerprovider`: Add support for JSON formatted secrets in secretsmanagerprovider confmap ([#​32143](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32143)) The `secretsmanagerprovider` confmap will now allow to get secret by a json key if the secret value is json. To specify key separate key from secret name/arn by `#` e.g. `mySecret#mySecretKey`. - `geoipprocessor`: Add initial processing based on source.address resource attribute ([#​32663](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32663)) - `healthcheckv2extension`: Add shared aggregation logic for status events. ([#​26661](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26661)) - `tailsamplingprocessor`: Simple LRU Decision Cache for "keep" decisions ([#​31583](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31583)) - `processor/tailsampling`: Migrates internal telemetry to OpenTelemetry SDK via mdatagen ([#​31581](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31581)) The metric names and their properties, such as bucket boundaries for histograms, were kept like before, to keep backwards compatibility. - `kafka`: Added `disable_fast_negotiation` configuration option for Kafka Kerberos authentication, allowing the disabling of PA-FX-FAST negotiation. ([#​26345](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26345)) - `pkg/ottl`: Added `keep_matching_keys` function to allow dropping all keys from a map that don't match the pattern. ([#​32989](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32989)) - `OTel-Arrow`: Update to OTel-Arrow v0.24.0 ([#​26491](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26491)) - `pkg/ottl`: Add debug logs to help troubleshoot OTTL statements/conditions ([#​33274](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33274)) - `pkg/ottl`: Introducing `append` function for appending items into an existing array ([#​32141](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32141)) - `pkg/ottl`: Introducing `Uri` converter parsing URI string into SemConv ([#​32433](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32433)) - `probabilisticsamplerprocessor`: Add Proportional and Equalizing sampling modes ([#​31918](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31918)) Both the existing hash_seed mode and the two new modes use OTEP 235 semantic conventions to encode sampling probability. - `prometheusreceiver`: Resource attributes produced by the prometheus receiver now include stable semantic conventions for `server` and `url`. ([#​32814](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32814)) To migrate from the legacy net.host.name, net.host.port, and http.scheme resource attributes, | migrate to server.address, server.port, and url.scheme, and then | set the receiver.prometheus.removeLegacyResourceAttributes feature gate. - `datadogexporter`: The Datadog Exporter now supports the `proxy_url` parameter to configure an HTTP proxy to use when sending telemetry to Datadog. ([#​33316](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33316)) - `spanmetrics`: Produce delta temporality span metrics with StartTimeUnixNano and TimeUnixNano values representing an uninterrupted series ([#​31671](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31671), [#​30688](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30688)) This allows producing delta span metrics instead of the more memory-intensive cumulative metrics, specifically when a downstream component can convert the delta metrics to cumulative. - `sqlserverreceiver`: Add support for more Database IO metrics ([#​29865](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29865)) The following metrics have been added: - sqlserver.database.latency - sqlserver.database.io - sqlserver.database.operations - `cmd/opampsupervisor`: Receive and report effective config to the OpAMP server ([#​30622](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30622)) - `processor/transform`: Add `transform.flatten.logs` featuregate to give each log record a distinct resource and scope. ([#​32080](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32080)) This option is useful when applying transformations which alter the resource or scope. e.g. `set(resource.attributes["to"], attributes["from"])`, which may otherwise result in unexpected behavior. Using this option typically incurs a performance penalty as the processor must compute many hashes and create copies of resource and scope information for every log record. - `receiver/windowsperfcounters`: Counter configuration now supports recreating the underlying performance query at scrape time. ([#​32798](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32798)) ##### 🧰 Bug fixes 🧰 - `filelogreceiver`: Container parser should add k8s metadata as resource attributes and not as log record attributes ([#​33341](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33341)) - `deltatocumulative`: properly drop samples when at limit ([#​33285](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33285)) fixes a segfault in the limiting behavior, where streams exceeding the limit still had their samples processed. due to not being tracked, this led to a nil-pointer deref - `postgresqlreceiver`: Fix bug where `postgresql.rows` always returning 0 for `state="dead"` ([#​33489](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33489)) - `prometheusreceiver`: Fall back to scrape config job/instance labels for aggregated metrics without instance/job labels ([#​32555](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32555)) - `elasticsearchexporter`: Duplicate Key in JSON ([#​33454](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33454)) - `logzioexporter`: Fix issue where log attributes were not correctly exported ([#​33231](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33231)) - `exporter/datadog`: Prevents collector shut down when Datadog logs pipeline fails to validate API key ([#​33195](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33195)) ### [`v0.102.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01020) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.101.0...v0.102.0) ##### 🛑 Breaking changes 🛑 - `k8sattributesprocessor`: Move `k8sattr.rfc3339` feature gate to stable. ([#​33304](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33304)) - `extension/opamp`: Redact all values in the effective config ([#​33267](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33267)) All values will be treated as if they are a `configopaque.String` type. This will be changed once the Collector APIs are updated to unmarshal the config while only redacting actual `configopaque.String`-typed values. The exception to redaction is the `service::pipelines` section, which is useful for debugging and does not contain any `configopaque.String` values. - `extension/filestorage`: Replace path-unsafe characters in component names ([#​3148](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/3148)) The feature gate `extension.filestorage.replaceUnsafeCharacters` is now removed. - `vcenterreceiver`: vcenterreceiver replaces deprecated packet metrics by removing them and enabling by default the newer ones. ([#​32929](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32929), [#​32835](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32835)) Removes the following metrics: `vcenter.host.network.packet.errors`, `vcenter.host.network.packet.count`, and `vcenter.vm.network.packet.count`. Also enables by default the following metrics: `vcenter.host.network.packet.error.rate`, `vcenter.host.network.packet.rate`, and `vcenter.vm.network.packet.rate`. ##### 🚀 New components 🚀 - `geoipprocessor`: introduce the GeoIP processor ([#​32663](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32663)) ##### 💡 Enhancements 💡 - `pkg/ottl`: Add the `Day` Converter to extract the int Day component from a time.Time ([#​33106](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33106)) - `pkg/ottl`: Adds `Month` converter to extract the int Month component from a time.Time ([#​33106](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33106)) - `cmd/telemetrygen`: Add support for adding spanID and traceID as exemplars to datapoints generated by telemetrygen ([#​33320](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33320)) - `cmd/telemetrygen`: Add support for specifying trace ID and span ID in telemetrygen for logs ([#​33234](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33234)) - `pkg/ottl`: Adds a `Year` converter for extracting the int year component from a time.Time ([#​33106](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33106)) - `filelogreceiver`: Log when files are rotated/moved/truncated ([#​33237](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33237)) - `stanza`: Add monitoring metrics for open and harvested files in fileconsumer ([#​31256](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31256)) - `awss3receiver`: Uses obsreport to report metrics for the AWS S3 Receiver. ([#​30750](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30750)) - `awsxrayexporter`: AWS X-Ray exporter to make local root spans a segment for internal/service spans and subsegment + segment for client/producer/consumer spans. ([#​33000](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33000)) - `prometheusreceiver`: Allow to configure http client used by target allocator generated scrape targets ([#​18054](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/18054)) - `clickhouseexporter`: Add `create_schema` option to ClickHouse exporter ([#​32282](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32282)) The new create_schema option allows disabling default DDL to let the user manage their own schema. - `pkg/stanza`: Expose recombine max log size option in the container parser configuration ([#​33186](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33186)) - `sumologicexporter`: add support for tracing ([#​32315](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32315)) - `exceptionsconnector`: Add support for exemplars in exceptionsconnector ([#​24409](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24409)) - `processor/resourcedetectionprocessor`: Add support for Azure tags in ResourceDetectionProcessor. ([#​32953](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32953)) - `solarwindsapmsettingsextension`: Added the first part of concrete implementation of solarwindsapmsettingsextension ([#​27668](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/27668)) - `kubeletstatsreceiver`: Add k8s.container.cpu.node.utilization metric ([#​27885](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/27885)) - `pkg/ottl`: Adds a `Minute` converter for extracting the int minute component from a time.Time ([#​33106](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33106)) ##### 🧰 Bug fixes 🧰 - `podmanreceiver`: add scraper's shutdown method ([#​29994](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29994)) - `awsxrayexporter`: Fix the DB subsegment(client span) name with JDBC conn string starts with "jdbc:" ([#​33225](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33225)) - `exp/metrics`: fixes staleness.Evict such that it only ever evicts actually stale metrics ([#​33265](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33265)) - `receiver/mysql`: Remove the order by clause for the column that does not exist ([#​33271](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33271)) - `influxdb(exporter|receiver)`: remove Metric flags field to/from InfluxDB conversion ([#​29896](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29896)) - `kafkareceiver`: Fix bug that was blocking shutdown ([#​30789](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30789)) - `exporter/datadog`: Fixes a potential race condition when the traces exporter and metrics exporter are both shutting down. ([#​33291](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/33291)) ### [`v0.101.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v01010) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.100.0...v0.101.0) ##### 🛑 Breaking changes 🛑 - `sumologicexporter`: change logs behavior ([#​31479](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31479)) - set OTLP as default format - add support for OTLP format - do not support metadata attributes - do not support source headers - `sumologicexporter`: change metrics behavior ([#​31479](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31479)) - remove suppport for carbon2 and graphite - add support for otlp format - do not support metadata attributes - do not support source headers - set otlp as default metrics format - `sumologicexporter`: remove deprecated configuration options ([#​32315](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32315)) migration has been described in the following document https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.100.0/exporter/sumologicexporter#migration-to-new-architecture - `remotetapprocessor`: Make the `limit` configuration work properly. ([#​32385](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32385)) The `limit` configuration was ignored previously, but now it works according to the configuration and documentation. Nothing is required of users. See the remotetapprocessor's `README.md` for details. - `groupbytraceprocessor`: Fix groupbytrace metrics contain duplicate prefix ([#​32698](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32698)) - `vcenterreceiver`: Removes `vcenter.cluster.name` attribute from `vcenter.datastore` metrics ([#​32674](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32674)) If there were multiple Clusters, Datastore metrics were being repeated under Resources differentiated with a `vcenter.cluster.name` resource attribute. In the same vein, if there were standalone Hosts, in addition to clusters the metrics would be repeated under a Resource without the `vcenter.cluster.name` attribute. Now there will only be a single set of metrics for one Datastore (as there should be, as Datastores don't belong to Clusters). - `resourcedetectionprocessor`: Move `processor.resourcedetection.hostCPUModelAndFamilyAsString` feature gate to stable. ([#​29025](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29025)) - `filelog, journald, tcp, udp, syslog, windowseventlog receivers`: The internal logger has been changed from zap.SugaredLogger to zap.Logger. ([#​32177](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32177)) This should not have any meaningful impact on most users but the logging format for some logs may have changed. - `awsxrayexporter`: change x-ray exporter's translator to make "." split annotation pass as-is ([#​32694](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32694), [#​31732](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31732)) This change make below change to beta stage for feature gate 'exporter.xray.allowDot',this change will let the change mention below enable by default | In the past, X-Ray doesn’t support “.”. So we have a translator in x-ray export to translates it to “\_” before sending traces to X-Ray Service. | To match otel naming style, x-ray service team decide to change their service to support both "." type and "" type of naming. In this case the translator that translate "." to "" is no-longer needed. This PR change the way this translator work | X-Ray PMs agree on rolling out this change by using feature-gate ##### 🚀 New components 🚀 - `awss3receiver`: Initial implementation of the AWS S3 receiver. ([#​30750](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30750)) - `receiver/mysql`: Adds INFORMATION_SCHEMA TABLES metrics ([#​32693](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32693)) This adds table size metrics using the INFORMATION_SCHEMA TABLES table: https://dev.mysql.com/doc/refman/8.3/en/information-schema-tables-table.html. Specifically, we are adding the columns: `TABLE_ROWS`, `AVG_ROW_LENGTH`, `DATA_LENGTH`, `INDEX_LENGTH`. - `exporter/otelarrow`: Implementation copied from opentelemetry/otel-arrow repository [@​v0](https://togithub.com/v0).23.0. ([#​26491](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26491)) ##### 💡 Enhancements 💡 - `filelogreceirules are not very usefuver`: Add container operator parser ([#​31959](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31959)) - `jsonlogencodingextension`: Move jsonlogencodingextension to alpha ([#​32697](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32697)) - `exceptionsconnector`: Make span name a default dimension for ouput metrics and log records. ([#​32162](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32162)) - `azureblobreceiver`: Support service principal authentication for Blob storage ([#​32705](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32705)) - `deltatocumulativeprocessor`: exponential histogram accumulation ([#​31340](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31340)) accumulates exponential histogram datapoints by adding respective bucket counts. also handles downscaling, changing zero-counts, offset adaptions and optional fields - `sumologicexporter`: add sticky session support ([#​32315](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32315)) - `elasticsearchexporter`: Replace go-elasticsearch BulkIndexer with go-docappender ([#​32378](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32378)) Replace go-elasticsearch BulkIndexer with go-docappender bulk indexer, in preparation for future reliability fixes. As a result of this change, there are minor behavioral differences: - flush timeout is now enforced on client side - oversize payload special handling is now removed - go-docappender uses bulk request filterPath which means bulk response is smaller, less JSON parsing and lower CPU usage - document level retry debug logging is removed as retries are done transparently - `elasticsearchexporter`: Converts more SemConv fields in OTel events to ECS fields in Elasticsearch documents when `mapping.mode: ecs` is specified. ([#​31694](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31694)) - `extension/storage/filestorage`: New flag cleanup_on_start for the compaction section (default=false). ([#​32863](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32863)) It will remove all temporary files in the compaction directory (those which start with `tempdb`), temp files will be left if a previous run of the process is killed while compacting. - `opampsupervisor`: Allows the supervisor to persist its instance ID between restarts. ([#​21073](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/21073)) - `opampsupervisor`: Adds the ability to configure the agent description ([#​32824](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32824)) - `vcenterreceiver`: Refactors how and when client makes calls in order to provide for faster collection times. ([#​31837](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/31837)) - `resourcedetectionprocessor`: Support GCP Bare Metal Solution in resource detection processor. ([#​32985](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/32985)) - `sp
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- exporter/datadogexporter/go.mod | 2 +- receiver/hostmetricsreceiver/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 4f76a941804b..215f988286f3 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -257,7 +257,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.105.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.105.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index 0c8a4972d8fc..6a549b597e4a 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.105.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.105.0 github.com/prometheus-community/windows_exporter v0.25.1 github.com/prometheus/procfs v0.15.1 From e32faefa73a266954667f31ae893cf10ba62f11f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:22:22 +0200 Subject: [PATCH 03/30] Update All github.com/datadog packages (#34204) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/DataDog/agent-payload/v5](https://togithub.com/DataDog/agent-payload) | `v5.0.124` -> `v5.0.125` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fagent-payload%2fv5/v5.0.125?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fagent-payload%2fv5/v5.0.125?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fagent-payload%2fv5/v5.0.124/v5.0.125?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fagent-payload%2fv5/v5.0.124/v5.0.125?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/config](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fconfig/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fconfig/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fconfig/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fconfig/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fhostname%2fhostnameinterface/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fhostname%2fhostnameinterface/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fhostname%2fhostnameinterface/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2fhostname%2fhostnameinterface/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/core/log](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2flog/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2flog/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2flog/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fcore%2flog/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline%2flogsagentpipelineimpl/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline%2flogsagentpipelineimpl/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline%2flogsagentpipelineimpl/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2flogsagentpipeline%2flogsagentpipelineimpl/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fexporter%2flogsagentexporter/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fexporter%2flogsagentexporter/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fexporter%2flogsagentexporter/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fexporter%2flogsagentexporter/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fmetricsclient/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fmetricsclient/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fmetricsclient/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fmetricsclient/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fstatsprocessor/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fstatsprocessor/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fstatsprocessor/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2fotelcol%2fotlp%2fcomponents%2fstatsprocessor/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2ftrace%2fcompression%2fimpl-gzip/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2ftrace%2fcompression%2fimpl-gzip/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2ftrace%2fcompression%2fimpl-gzip/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fcomp%2ftrace%2fcompression%2fimpl-gzip/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/config/model](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fmodel/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fmodel/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fmodel/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fmodel/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/config/setup](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fsetup/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fsetup/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fsetup/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fconfig%2fsetup/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/proto](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fproto/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fproto/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fproto/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2fproto/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-agent/pkg/util/hostname/validate](https://togithub.com/DataDog/datadog-agent) | `v0.56.0-rc.4` -> `v0.56.0-rc.6` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2futil%2fhostname%2fvalidate/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2futil%2fhostname%2fvalidate/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2futil%2fhostname%2fvalidate/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-agent%2fpkg%2futil%2fhostname%2fvalidate/v0.56.0-rc.4/v0.56.0-rc.6?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/DataDog/datadog-api-client-go/v2](https://togithub.com/DataDog/datadog-api-client-go) | `v2.27.0` -> `v2.28.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fDataDog%2fdatadog-api-client-go%2fv2/v2.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fDataDog%2fdatadog-api-client-go%2fv2/v2.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fDataDog%2fdatadog-api-client-go%2fv2/v2.27.0/v2.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fDataDog%2fdatadog-api-client-go%2fv2/v2.27.0/v2.28.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
DataDog/agent-payload (github.com/DataDog/agent-payload/v5) ### [`v5.0.125`](https://togithub.com/DataDog/agent-payload/releases/tag/v5.0.125) [Compare Source](https://togithub.com/DataDog/agent-payload/compare/v5.0.124...v5.0.125) #### What's Changed - \[USM]: add placeholder Redis stats by [@​Yumasi](https://togithub.com/Yumasi) in [https://github.com/DataDog/agent-payload/pull/325](https://togithub.com/DataDog/agent-payload/pull/325) **Full Changelog**: https://github.com/DataDog/agent-payload/compare/v5.0.124...v5.0.125
DataDog/datadog-api-client-go (github.com/DataDog/datadog-api-client-go/v2) ### [`v2.28.0`](https://togithub.com/DataDog/datadog-api-client-go/releases/tag/v2.28.0) [Compare Source](https://togithub.com/DataDog/datadog-api-client-go/compare/v2.27.0...v2.28.0) ##### What's Changed ##### Fixed - fix monitor enum by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2569](https://togithub.com/DataDog/datadog-api-client-go/pull/2569) - dashboards add support for time-slice SLOs by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2570](https://togithub.com/DataDog/datadog-api-client-go/pull/2570) - Make modified by field nullable for get all API keys by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2576](https://togithub.com/DataDog/datadog-api-client-go/pull/2576) ##### Added - add cross org uuids to timeseries query by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2535](https://togithub.com/DataDog/datadog-api-client-go/pull/2535) - Add network performance monitor type to API spec by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2546](https://togithub.com/DataDog/datadog-api-client-go/pull/2546) - Document `force_delete_dependencies` for synthetics test deletion by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2540](https://togithub.com/DataDog/datadog-api-client-go/pull/2540) - Support metric filtering in integration azure GET, PUT APIs by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2551](https://togithub.com/DataDog/datadog-api-client-go/pull/2551) - add enableProfiling and enableSecurityTesting options by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2562](https://togithub.com/DataDog/datadog-api-client-go/pull/2562) - Add convert rule JSON to terraform to Datadog API Spec. by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2537](https://togithub.com/DataDog/datadog-api-client-go/pull/2537) - add changes for datadog partner program to estimated cost and billable usage APIs by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2542](https://togithub.com/DataDog/datadog-api-client-go/pull/2542) - Add type as a required field for the different basic auth types by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2553](https://togithub.com/DataDog/datadog-api-client-go/pull/2553) - Adding Network Device Monitoring API Documentation by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2548](https://togithub.com/DataDog/datadog-api-client-go/pull/2548) - Security Monitoring - Support anomaly threshold detection method by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2567](https://togithub.com/DataDog/datadog-api-client-go/pull/2567) - update hourly usage API docs for partner program by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2577](https://togithub.com/DataDog/datadog-api-client-go/pull/2577) - Add resource_type query param to authn mapping spec by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2515](https://togithub.com/DataDog/datadog-api-client-go/pull/2515) - Add rum stream to API definition by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2581](https://togithub.com/DataDog/datadog-api-client-go/pull/2581) ##### Deprecated - Deprecate `ListAWSRelatedAccounts` by [@​api-clients-generation-pipeline](https://togithub.com/api-clients-generation-pipeline) in [https://github.com/DataDog/datadog-api-client-go/pull/2585](https://togithub.com/DataDog/datadog-api-client-go/pull/2585) ##### New Contributors - [@​amaskara-dd](https://togithub.com/amaskara-dd) made their first contribution in [https://github.com/DataDog/datadog-api-client-go/pull/2573](https://togithub.com/DataDog/datadog-api-client-go/pull/2573) **Full Changelog**: https://github.com/DataDog/datadog-api-client-go/compare/v2.27.0...v2.28.0
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://togithub.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcontribcol/go.mod | 114 ++++---- cmd/otelcontribcol/go.sum | 248 +++++++++--------- connector/datadogconnector/go.mod | 114 ++++---- connector/datadogconnector/go.sum | 248 +++++++++--------- exporter/datadogexporter/go.mod | 114 ++++---- exporter/datadogexporter/go.sum | 248 +++++++++--------- .../datadogexporter/integrationtest/go.mod | 114 ++++---- .../datadogexporter/integrationtest/go.sum | 248 +++++++++--------- receiver/datadogreceiver/go.mod | 4 +- receiver/datadogreceiver/go.sum | 8 +- testbed/go.mod | 4 +- testbed/go.sum | 8 +- 12 files changed, 736 insertions(+), 736 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index a4fb14466145..c2284e11d2e2 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -289,64 +289,64 @@ require ( github.com/ClickHouse/ch-go v0.61.5 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.26.0 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/agent-payload/v5 v5.0.124 // indirect - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 // indirect + github.com/DataDog/agent-payload/v5 v5.0.125 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect github.com/DataDog/go-sqllexer v0.0.12 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 62c4ceb64ebd..ebd50c25d48d 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -723,136 +723,136 @@ github.com/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= -github.com/DataDog/agent-payload/v5 v5.0.124 h1:m7MLSy8oyLQDT59oesWhZiSFDzV/Q9CWzhue7s2SFaw= -github.com/DataDog/agent-payload/v5 v5.0.124/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4 h1:B34pJWfJ2kgaA30FoUoDUVDCca8hqi+kF7roUNyR8fs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4/go.mod h1:tPiFyIyrV0aneNrCY/fcyXo0GJadipU+aaIvoIWc6So= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4 h1:WzYTLPvFJ988nkONrR70ZwRGtOsqg+mmN3o21+YQd0U= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 h1:MWSdTnKhrex23ogDnwZGAk2OHFg2Nnp1CHWHtVrSruc= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4/go.mod h1:HgBvWpUeiM6yQWinv5lC7ERwpSJSb2dvxjnXeRHJ4r8= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 h1:L7Cvcp7xNyGpCGvrOh09F/JcnU1hvRSAS229XuIU04o= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4/go.mod h1:xTcCh6NEMd3QSsGYFFCoSwSE5Jg02OiVTD5VkP2V4hU= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 h1:CRJ47Lr2nqci6FC0gFK06MgQDT6l0iqO3EVXIynpAVw= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4/go.mod h1:roYYeTLsTH6Hd4p7virGlOUmgj37xa2CyM1fwgB0kmc= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 h1:sPj08c37dNUHZqUf3YtYsMRSb09ff8H8cdg1ZfpEziM= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4/go.mod h1:8XkiPzlYf9SGoh8rBjBW+MI2m+FOZdsuW+KQrzadJ7w= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 h1:1PwVhlPJaK3eeRx2oItbuye9r4+Bkt4c4Rdp6vjf0rM= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4/go.mod h1:e/hjXQITP8HoLdV6wbTf3mlqDTPnCJUYj2+VEHGiqeI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 h1:P30SsL1Sy417bD6OhcmyYIooCqU3dsE9y56kZ+iZ6aI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4/go.mod h1:hFJwvCOvHGzjwGCyM3BqQ3t9TF2gDypkoYbSsbNgQs0= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 h1:Y28aOfvmc6ces18bHBsoZOzRT6xytp4H7XmPDDsKlfA= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4/go.mod h1:ir8z0B+Ab8fM66MuraFyRbNHAj8NZxPkKvuf/uhPrYs= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 h1:BDFW8jh+tgIjZG6ItniePPlYdiOyeArWbgs5I9d3j+w= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 h1:yTU8MqnX3C78veSRdcTkySwj94/9gatxRczcNzYGEqA= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4/go.mod h1:1IZjuOSQ76J1oobrVtwGvuBBtHm9tpx29VZdDebSSQI= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 h1:Vcf20HV1hVcdTnJORMBj9gi4JmNJVdqC3gFPobxHXWc= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4/go.mod h1:eansf2vENM4gAWeOBXL+8szwQHyIxuNo9PVIygvhI54= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 h1:m/V/ngMk3NtRvudl3912876XBc/f/z9qZutf3TTZvKA= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4/go.mod h1:ifREGSm6GTGn3oB8vGgwnMHeW2/BIbiThW3URd755GM= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 h1:MDcx5ATdVVp2unsGlRO3J9lmarFveTiT2m0QD1zpxN0= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4/go.mod h1:IQ0aKL3gkJUW2FwIeKK/TaGrgX6T19vkDNtTyvcoHPQ= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 h1:UXBgAgKPPMMx44yE3wecI7n9zj1gj++xQ5NhHTFmdgA= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4/go.mod h1:MM8Vmewv4+knZUX+dr0HMbQywmu8LeIH4igS5uZrUko= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 h1:kvCbL+lKGyNaxDxE8wvfxNCMyvJxa4VeBikm8tRJ/i4= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4/go.mod h1:xhZoGJAEXEXh0NfLd5mWq1uQElC4Nr5c+9a/FWsfQ5w= +github.com/DataDog/agent-payload/v5 v5.0.125 h1:ZMlATwFarkDkr3aKyDI5UKPtZxXd9/Jsk5v28ncGx4c= +github.com/DataDog/agent-payload/v5 v5.0.125/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6 h1:LtB5es6u46jYOBdM8n79fClUV2o6Skn65ULSDvWlTyA= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6/go.mod h1:Sa8nnkFInG63Zpw1jN3AQoBPkLH+dNe6YJ1f8a8B2zw= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6 h1:OLwcYbBhedl3bqhboskVNfCIhNGXt9v4vZQ23ortFkA= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 h1:zVmIDZ/gTi6YEHB1xa1UEZUvROak1jR5NmEvmMaznHI= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6/go.mod h1:qSeL3uBTymqGA12+iZigInpIAPxhe1Tza4ULTePXPJw= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 h1:7Mw5kQDtMNIe97EJopWCwdNHOEDAIWYVbvjrwarodmQ= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6/go.mod h1:iLTIqAuD91w33X/4g1mbBeK0Oi3DLQOuqfuVqrLeTu8= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 h1:AKQMFS/Nd6KKwyeu/5U7JULe3TIFP10riB/V1RJBBgk= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6/go.mod h1:ncS65mbIKis7h5QYYGt/i6b1q6YSn8f46ZknRj3GeII= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 h1:bKEk3elksjR4B5OAngDK5dEIgUWfeYxBmpmlEzncQ+A= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6/go.mod h1:luPVd6SG2Xj0ESRoVko17VGyRlkGkhy658nPozOyCac= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 h1:HvIIXUuKpaVeBVmHkKBGB9AZamzDkMrzBSZYNpeO4Zo= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6/go.mod h1:K4ChYiTuODSLlfMCbfHG7UZ7XUpozprIx0/4vRNiDM4= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 h1:qNy6hwa2pSW+BN3Fq9N/KNSzlm5GtrEVqKV7gPOhPrg= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6/go.mod h1:+nGjNsTO6DbqA9ihSX9wvMMFZg2mVOxDTuRoa4AH1KQ= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 h1:y3gMhmVxlerzfeNgG9XfPY7Pw9H+EctcJsPNqIoNOUA= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6/go.mod h1:SF7SHuoUAQ9xw1vmFcF3I2cUedZLyyx+jXMckkv3jbM= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 h1:gYuKXzk6G2y8lLbWmDZv4wz5ZjBoyN8rMG1m0eT9hq0= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 h1:UNin36Rnd/6/zXNR/qo0CTq/r2GDD+HgBFWkC1lbp7I= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6/go.mod h1:pG905gicJdVeoAkX5+w8Vlf5YIFPsvrNiaFZO9p9gFU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 h1:qho+fj+KNtJXaZAi6g1fQCDY42RyVHzBwbcXK6+bIEA= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6/go.mod h1:vY/zZXlsi6d45o7MTOXvRI1pCuXboQzcJ1KndkoAIfU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 h1:2eCOKx5eGh/PSTLjD9WT7bx7j3DVihelYrPwtz1DpF4= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6/go.mod h1:GXACzKmOddiTT50LfNPeWy6qaXz0oFKvBia5tb/jL58= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 h1:tNhdyg874ZZtimgx7mX5dgj7pv4QoebpOlyxaaYThdo= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6/go.mod h1:lRdM0+XeOWXRMnEt7kEMaP2f7SreGZ3lTua3EShNfk4= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 h1:9Z7tL2As/k5xVKtdc7y7udittzNMY0L5cBiqz2WvOLM= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6/go.mod h1:MXbhVcvq9gvxOjd8jSRWl1gQNnTHflqXqogfvbeXT7k= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 h1:it53s8qoAMmPCEBFVrcVl3QKV0ElQXBAJfxUek3uC+8= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6/go.mod h1:DN6AQT2QbqZbqChoRx4Hd2szkbO17zX7OxwQt5PJA3k= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d h1:wdjJ+/tBYiFLwno+lBPP66rm5jIf6ycGPRr21ogBBzE= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d/go.mod h1:CHa8CY2k0/wZkx/4KPi/WU/0m5YCfWZI1SAs1imElMA= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 h1:36SealDqBpRc0AsbWuf0noV6Nc/1xID9MF3KV8eV+mM= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 h1:4KSg9nMgxGXuf7LRYQ211KOReW2qe0Bx+p4mGZytzZI= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4/go.mod h1:tkHMGP1ivmmkOc3qO5Tk8eiVet+WqpFlkYpqbRulT64= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 h1:n/7FaY8rqSE2sePYLmu5XPYS2Usv7oKTWLKtJz2BSvE= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 h1:z3R6FPPOJeCMoTpNxmTpqlZwwSCMKIrhJT/Cc0iMVW8= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6/go.mod h1:b+ThhJiUhK3AC19XnwXgraGlKIP4rPUSCPu229PusAE= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 h1:Hq2tQTaFcEJy9o1QFb9Ql/gm0uRzrYQkFEZGPVKLMHI= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3/go.mod h1:TOlu5v8b46+aW9h3KLZdOiwz3gJkoQerT3+F3st6ZRA= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 h1:ThBBkW9Sgp6u0UUWZDH0p+ZHGYwrM/vZPdVEvEBFUAc= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 h1:LkpNNFR3UMaWGbwVmkphw96fgGdgqvO8h9fAwABe42o= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4/go.mod h1:6uwVrNNEzdL2bczKAGjNitv91b35uJENDod+eTlah88= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4 h1:nKPi1R2w461Ad70F0uSbWYMQSrudCK+ipzDPwvsMu7U= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4/go.mod h1:rUYPK8Kj3NnJgkGGTFPqF6S6m2YVgD1ny9oRVBwdPr0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 h1:rvDDMMs2lsMG4RP9BXAdhySIONaQ29msx9Qcfj3jPW0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4/go.mod h1:ocHb4Lk0C6WIdLnp6ZZcvpgdYG639hnZkfopbCLOWAo= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 h1:to2j2pjJ7kN9LFIay7swUECLv9of+zG4azjMP4RnKRE= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4/go.mod h1:2UPUGBeQzxtjAZ2UhBVGYzalE72y7/WuvaJP2wi5G+g= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 h1:W4wwSuwCI1sQPVlEyEIkOEi17OQkuAAo00JWG3a8280= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4/go.mod h1:9887F1wbPDJ4k32J/osibBm4Dx1mf79qM3bvo9+/sqo= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 h1:96g1V6PQaA81ttboGrseIsTy/YXRuBjc/n/Od50JLLs= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4/go.mod h1:RSeEw2XF+jaW2bISKBp5jRgZfAmB+iiIUuRP+1kiAcw= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 h1:aBbAd+lnAckuAy7JlCvjRqXxMXe2gCGWhc5BlZeTBuM= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4/go.mod h1:GX8x5SLGXz4d2pXlO7MLQC8Jhc2dzpH1xjX9c0OLj+s= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 h1:ApOwzW4pyWmaadJZB1yYvOSnD0pZFoxiQTDIzb6eeqA= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4/go.mod h1:+BNG3ffJgTee+rkPltaeckrzTgtJ7Bmw+Y0bGlE7abs= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 h1:bMFx5bt7wmiNraARxHum72RPW09Yp+Q2/hF7IwKvOGU= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4/go.mod h1:6fzyY2f23A8eT/OuCdde43BUYTtw5xdY8M92LlSLAtI= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 h1:jLJBMZqFpoLq3eF36fcdjNgtTNbsLru4+4ulVz3rKiw= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4/go.mod h1:Vf19YCap4AXUAKFJXNXJX8AaNaaBTiznLzT3FbNZ9aQ= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 h1:6vYC6ib5egY3URacLettE8oQuYKUssKsjleGQSuqmFA= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4/go.mod h1:W3MkNNcILOrtx2e2Fv+4VNrUOP0uqrSax39i+zW6bSE= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 h1:WJuuko9WxaEY5/O7820MdiuOS/zfWLmCDJ5I70GzpJM= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4/go.mod h1:vFbjlkJvc6f3U8IDbQDUN2IHNfOmtyidbU9ZsPwVBDM= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 h1:6b4aTOXt0iCMUgKAvEM+EcOE2YJx9s7pRLGZk2tTUpc= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4/go.mod h1:r60+SPRvjEMYWAUPEDSM9TE3CeHhQdr/RMlQVRw/tvk= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 h1:T2cl+OaecGnc+LObbE4CdqmMBCAebH3CIbWRegYbddQ= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4/go.mod h1:gPi5PQHwQpKDX+eelStx/uIorwVbxvJ4KKM2f+SA9rQ= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 h1:RHwuqp+IMrKCYTE9Jo8wg2SgYMVzzjbucDvKQXSgCnM= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4/go.mod h1:wh9D6UK6G7WFMLHMB/HYgDEJQdRgyYVH8fzRraq/QBI= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 h1:IL0tVxPIPpkeuPYz1z3t28SfDI/oRkJaWMD5sVPyaQA= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 h1:Cj/NtIX2GtgP5SYDvxF8HE6kzkvpkWbiqMDQ+0J831Y= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4 h1:A8sWzhqbI56Ow1aS4XjvFbMhPK/Je7Vi4WBcN6zto+Q= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4/go.mod h1:xh+1p0cPMvgHG4PrmsHaagIXqynL/hwIF5Kjtx4aImA= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 h1:ga4n85LQfEhnhz2ThipT2XOqt+6TLXOaoNiluxD/W2w= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 h1:Sj8GB7554oXI7Ek6eDx9skrwWfnxzlaBzDuZCRCFSZg= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 h1:GJ+ba3Ah0W+v1kh98+D6JaUfduJhDBCnlhK3wrhj9YI= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 h1:zFGqASkFXZeL49KHNCu7imxFOYsIhAypRXtuOpSqtF0= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4/go.mod h1:JqwmxL8i5xU/k7iKpE1LMhDxdYdL2yEUTY5IETlG+QM= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 h1:OU1bNaISmExhvf1UCDVN9ccoVajxqOvOh2twSRgdaHw= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 h1:pb77YxVpsyT5gX2sbJqDtJQRRBOm4q7JNPWKajdg8Vk= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6/go.mod h1:kS8TDCdO0gvl2BMRL/0XpsWR/cEnDy+HI7ZtuWPUVo8= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6 h1:eYpXZ1sn+ljObazwgUIIRcJcEjNDlYfkjrCTCYmJ/b4= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6/go.mod h1:fus2khOw7APls2ZgIwdqVjA7nq+YMlOsiIivruXI0BM= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 h1:OjyXksyVjttCZWDGm6/LNX6YyxjqllnQr6oxuhhbv9Y= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6/go.mod h1:MLm5dh6z8ZQabiJq5NKr0A/0OQMjzcYQ8KWtCy56/GQ= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 h1:eTzuTY1hcfyPKq50UdevLF4MtFUMWh14ICsTHuM38zo= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6/go.mod h1:19YxHi3uNleq4GqHtzBcGwUTuwWKDq2EHjbqoEjgVBA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 h1:i0hTL9y6kBs55ItixfSm/gW1URCZoww3sxPBwiI5sFA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6/go.mod h1:TO6lxOK2W3rYsYbXXggQxKFvyq7lBP+BKz0/wfWq/LQ= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 h1:149QCTyg2nzYLt3bSaAVA8MlOg5mOrlrp7LMqyzSSt8= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6/go.mod h1:iKaCYetHU3IEV06SL2I0C5GvB5vF8+8v0jJuPCP5ux4= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 h1:uYOJhYhdQeQK+wvrogjce+YefaizdIL4PiOZAeCPHDU= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6/go.mod h1:qo+6psfbEWHj4OoPdaoUgPXO6e+f4rS0lqSwDUJKWAY= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 h1:YZHYQIcRR3N3/mM6s/0kEle1MKl3Kh+CVH0+sTRld98= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6/go.mod h1:KZxnmkdM3WiECe85Vkb808UDPNDnQV5+g1ehJn/Gyic= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 h1:uFhDhOgTC5uAvPa36CbyQ9hMpuX3Zf/PqXGq7at1FVU= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6/go.mod h1:gSE/BdDCYIFQMvQfyQyCDR8BfypxHZK1laqlbV/fqNI= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 h1:xqwHjzMcRvYeB6QjUYumOZzVBI6fpw4ikcBhMIQyiEU= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6/go.mod h1:sgzO75jq8IYXUbFzV+7XcZI5trBXNCilaqHXcZVQgMg= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 h1:OMxPtCNvW3MoEy8Nr54RjOPJF6pCN8PN0FW9fuW8Vzo= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6/go.mod h1:4/IgGNdC75iefcBc2LEMr9U0J/Eoj6tjFAhVmRoOfzI= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 h1:sMCW+l/t4pAlzMZklxXuVu0K84av+nL8liav116qrgc= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6/go.mod h1:urtlvCbtXEcuawxhFxTtcSV8dJXPfXFrBZKcdv0WF2A= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 h1:FuiSExW/kMGJXVbZ79vTML+elgvLnbf75tBx7qyFdyY= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6/go.mod h1:4Z/dg0+t11prtrrztedCPJ+oTK2PLpBaVMkU+8WIdPw= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 h1:ZAmq/QB3lZjTfydN860PH2frLmOoLB6YnSOspEhpCxs= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6/go.mod h1:ObJFyZpxENGOCL+Q/8+mZWlZxcV9wls6clr8c9JIDTY= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 h1:4fkw2/jImZdRrtG0NXhFDAj4CSpyEEyBsEQg7cIiM7c= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6/go.mod h1:8Dz2robkpfeJqbkZrBE1nrCaTEMfcGp8t8l2n9VexnQ= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 h1:BtsjxKQP7oH0buBJLnjPF4OHfUHow2q4LXsmqkSniI0= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 h1:35B7SqLMMt+haFDAx2RVLtVamEmNa16mOh7k5yDFBKU= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6 h1:yuShxJ13INdeYYH60M1DvZGAGBIrbqyfwX1qSD3l8yY= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6/go.mod h1:wQe4Ppzqh6jnmhZZjTozY06KsQ3AErT/65kstm6jHaE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 h1:fmIyoWn7HHVOK6RCizXmJtCjmPnShRTRBgtdEnoT6PQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 h1:yKfzVgRiwit8NTZR0iJ7d1e+7D155+VphNe5ci0v7h4= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 h1:l6vgnYVtUg86zBSc4z8rMMA0z86ADfi/3/HOhsnpgQc= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 h1:QY8IhqW9t6nXlg6HxURhFOT5GFHCpbNTyoffbDe6bbU= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6/go.mod h1:rUexndyX0/drZbyDBS/ySjOZv/sdbyCy/e+i+vjME60= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f h1:qhko+fLzYmtbqHkgT/GbShyTLAmq5MFeYbknldWsPDs= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f/go.mod h1:2NvzQC8eTtIHI94ymG1UqXZanSXlL3KOiZ5oIoTAdsI= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 h1:ENtyvawVW48h2/zKSskTqVGTb+A+28tQPFeKPl60T2g= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 h1:Oto2Xy/YbirVWVP14Tc7ZNraVrTe9keuT3m1VDhe63s= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4/go.mod h1:oFNxu8w44yImFD3eQyfmtaN8Dcn7k31+QnBXpE9DJkc= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 h1:YHBcs8eeNWQqtX79xuIbJDNzcwjKShObBCNsE4Q1NNA= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 h1:f/6Fv8J7o/NX+ohk36b7OeCRf6E8SeM/Ia6wrysLA/Q= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4/go.mod h1:b31C70BF+erIi8UAhvZ5lltxr79RYlVyQSeIbQAmBZI= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 h1:sQc3B3rAaC2sppYl+jHu9TRpKD49jOpNWt8m0NmcM5Q= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4/go.mod h1:n/EeRNU8/JaU1Jbsbru6ul0sLuW0H0VimMnmDZX3cGU= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 h1:/9A3Ef/pUlygTRVg5GpDPh86wjQxne3bndQRir/FoFY= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4/go.mod h1:Yel4HfEYB15LI0G5NgO9n35v5F8GfrP/6V+kuZGOvXg= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 h1:bRL2CFOXVSMz8X2799naoFeyovXlD0jqazEd/eybrzQ= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4/go.mod h1:af4ZmImSYQtNfoRamUTYOMo5NsOiRNdMxE+Ng7ldits= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 h1:BviquFfVz0JY8Ou8Ra84duhgd4XFpiHdmeZb3E2OHkw= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4/go.mod h1:r+M7l7K5GkvznIdLLxh6edDSgrS5Ncwuvh8UP6FfMZ4= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 h1:r7meov0lv45F2Ct30sRizZGWYqUX6TqaVFPl7AEdSKw= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 h1:LdCGAX+GFA5iy2Jl+3+tdBYwaQCDYa+fJ9bq0djtxQ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 h1:4HAlPx6EWkgb/NcbQZXD8YP61hlFk3Mpy+a8ihw7VS0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 h1:2xa1Fvm3/kzCz64tklaJx5JUlgZMnSLvFzJwDRhiCBU= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 h1:liTie/WZnLsizRFZ4/pS1LGzPKA+67iA2b33v9JEN5o= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 h1:MI50jVYeoXbrjGaCvVg51HFKVpMp7/9+T7p6qsVQ9lw= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4/go.mod h1:LjVkZvONaQdyIXZ/w1NoJ2XjGK8Hd+a5lAQpfE893Hk= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 h1:eenwM6MlHyQ6LGveUgwR1R2g0deUuznNG9Ggiwf4+OE= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4 h1:evbwHpEUAcvYXknhzvDwzzFhCMIjMo3peZaCsscJu0s= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 h1:nD3BpXisIP+2ymcvXs7nObfxNvp5GZpEQYc3Uj2i1L4= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4/go.mod h1:8Nj/lUHSxAVz/Sc5n0tnHXgWEOmwPRHuMl7QElaYibI= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 h1:9v0R6W1bsj9PU2WcYOh155MiRxw8ec3ELEVl/ze3DmU= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 h1:nAQ0IxRzcz/wSMIAf6JkjWaPZ8e1PIHCrHNrE9sRNM4= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 h1:686C9eoF82jeKmFqOpgAzHinbWkm24xSeUPV3IpHQF0= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6/go.mod h1:ENrY8lv3RBn9dBXtYu9rVApfnUDvPpdk4Wkkm+jXBJY= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 h1:wKBXTEBgNueKU77Zi8gGK78gMBU2eNV+tkWGJfq8sTU= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 h1:PgqDXJ5MH/QgZdav3ceaqgQJluwrH/t/fuv9wCDt3PI= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6/go.mod h1:iWuaAayud9iJBlnfQqBEmQyQs4mbjeSWvZ9tr3YXDDc= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 h1:/0VRtMBRwVr/ogt7Tamb5oQ3XCumTl5lOdlk5Uc6KBM= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6/go.mod h1:z1j32phXt8lVa0n5kQaFi8P2mtjDhQmSZcNBn5Pf/9w= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 h1:CyWPUqh+uYao32xV1mG5l1osnUZEbe8ejTHDn4Bs860= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6/go.mod h1:dtwg8dtia1iqhoftFD24ZWayKOdHdDZWymA0BTcyLvE= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 h1:EyjE4yiZHfnXgicYnfiqTNOaFfeCwNiH3jV/GUq/es4= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6/go.mod h1:LAIr/bbTppGIAjy7EZXUU5pxu7e3If83OO+8SKKQx3U= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 h1:rwnbc2e/DLw56CKgzs/Ibqer5ShjA1V8olnmekcmC+Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6/go.mod h1:Hiyb6L8eoZjCZgHTDOzoXTo0NqgHH5gX0EcomHr7QiA= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 h1:6kBc7L0BZ11htsNyclCJaN5IUi0EHPbauki3/wdXPwU= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 h1:POsiTWzdyV9gkTFAK3pGBIwRwGAAdGIqv2u76zafQY4= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 h1:/mXOc644CYBtA2Ck3oJNF7VfYbjOfAzKhtSLd2tFu3U= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 h1:lljXGdvEEOVxUAiltMI2i1hPj7cOlUQm/Sl5Ofw9ZHo= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 h1:yVRtV3MChW9ZrcMn+xcgzJ0r/CMJ2MfoZgwK+cy7OA4= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 h1:WbLpNspSnYFbtYUKtevdiawt9/nvEahdrmqroYuzaos= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6/go.mod h1:6YNUIA0LejPEjdlbHwMfY2vKTYfR2IjA5EaOk0bUWow= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 h1:fIjm7+gXZCFxKNQQDQUXsFL5lXR3VAsvCiyLugomNOw= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6 h1:EeA2wDREGCbeIk6UFyLZ/jdFm6itmDisiwrbHvIFMIY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 h1:spJRfOwJrCeJXWEzFvjZD+Vvsr1q/jiaxpIIchqTlfs= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6/go.mod h1:KsUItPqRj8C6oHipUNr0Q/bUzwaeQ4SVeQ58uK6HsT4= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 h1:RqOa8G/MlCoH4Joxumu5JXVqNXl1+l2hHm9VluBbt7w= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index a45838b9ab04..f00ea69fc74a 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -3,9 +3,9 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datad go 1.21.0 require ( - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.17.0 @@ -37,60 +37,60 @@ require ( require ( cloud.google.com/go/compute/metadata v0.5.0 // indirect - github.com/DataDog/agent-payload/v5 v5.0.124 // indirect - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 // indirect + github.com/DataDog/agent-payload/v5 v5.0.125 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect github.com/DataDog/go-sqllexer v0.0.12 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 3ae3f68b93ea..cf16dc6b5ce4 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -66,136 +66,136 @@ 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/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.124 h1:m7MLSy8oyLQDT59oesWhZiSFDzV/Q9CWzhue7s2SFaw= -github.com/DataDog/agent-payload/v5 v5.0.124/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4 h1:B34pJWfJ2kgaA30FoUoDUVDCca8hqi+kF7roUNyR8fs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4/go.mod h1:tPiFyIyrV0aneNrCY/fcyXo0GJadipU+aaIvoIWc6So= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4 h1:WzYTLPvFJ988nkONrR70ZwRGtOsqg+mmN3o21+YQd0U= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 h1:MWSdTnKhrex23ogDnwZGAk2OHFg2Nnp1CHWHtVrSruc= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4/go.mod h1:HgBvWpUeiM6yQWinv5lC7ERwpSJSb2dvxjnXeRHJ4r8= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 h1:L7Cvcp7xNyGpCGvrOh09F/JcnU1hvRSAS229XuIU04o= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4/go.mod h1:xTcCh6NEMd3QSsGYFFCoSwSE5Jg02OiVTD5VkP2V4hU= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 h1:CRJ47Lr2nqci6FC0gFK06MgQDT6l0iqO3EVXIynpAVw= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4/go.mod h1:roYYeTLsTH6Hd4p7virGlOUmgj37xa2CyM1fwgB0kmc= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 h1:sPj08c37dNUHZqUf3YtYsMRSb09ff8H8cdg1ZfpEziM= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4/go.mod h1:8XkiPzlYf9SGoh8rBjBW+MI2m+FOZdsuW+KQrzadJ7w= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 h1:1PwVhlPJaK3eeRx2oItbuye9r4+Bkt4c4Rdp6vjf0rM= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4/go.mod h1:e/hjXQITP8HoLdV6wbTf3mlqDTPnCJUYj2+VEHGiqeI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 h1:P30SsL1Sy417bD6OhcmyYIooCqU3dsE9y56kZ+iZ6aI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4/go.mod h1:hFJwvCOvHGzjwGCyM3BqQ3t9TF2gDypkoYbSsbNgQs0= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 h1:Y28aOfvmc6ces18bHBsoZOzRT6xytp4H7XmPDDsKlfA= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4/go.mod h1:ir8z0B+Ab8fM66MuraFyRbNHAj8NZxPkKvuf/uhPrYs= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 h1:BDFW8jh+tgIjZG6ItniePPlYdiOyeArWbgs5I9d3j+w= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 h1:yTU8MqnX3C78veSRdcTkySwj94/9gatxRczcNzYGEqA= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4/go.mod h1:1IZjuOSQ76J1oobrVtwGvuBBtHm9tpx29VZdDebSSQI= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 h1:Vcf20HV1hVcdTnJORMBj9gi4JmNJVdqC3gFPobxHXWc= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4/go.mod h1:eansf2vENM4gAWeOBXL+8szwQHyIxuNo9PVIygvhI54= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 h1:m/V/ngMk3NtRvudl3912876XBc/f/z9qZutf3TTZvKA= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4/go.mod h1:ifREGSm6GTGn3oB8vGgwnMHeW2/BIbiThW3URd755GM= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 h1:MDcx5ATdVVp2unsGlRO3J9lmarFveTiT2m0QD1zpxN0= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4/go.mod h1:IQ0aKL3gkJUW2FwIeKK/TaGrgX6T19vkDNtTyvcoHPQ= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 h1:UXBgAgKPPMMx44yE3wecI7n9zj1gj++xQ5NhHTFmdgA= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4/go.mod h1:MM8Vmewv4+knZUX+dr0HMbQywmu8LeIH4igS5uZrUko= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 h1:kvCbL+lKGyNaxDxE8wvfxNCMyvJxa4VeBikm8tRJ/i4= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4/go.mod h1:xhZoGJAEXEXh0NfLd5mWq1uQElC4Nr5c+9a/FWsfQ5w= +github.com/DataDog/agent-payload/v5 v5.0.125 h1:ZMlATwFarkDkr3aKyDI5UKPtZxXd9/Jsk5v28ncGx4c= +github.com/DataDog/agent-payload/v5 v5.0.125/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6 h1:LtB5es6u46jYOBdM8n79fClUV2o6Skn65ULSDvWlTyA= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6/go.mod h1:Sa8nnkFInG63Zpw1jN3AQoBPkLH+dNe6YJ1f8a8B2zw= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6 h1:OLwcYbBhedl3bqhboskVNfCIhNGXt9v4vZQ23ortFkA= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 h1:zVmIDZ/gTi6YEHB1xa1UEZUvROak1jR5NmEvmMaznHI= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6/go.mod h1:qSeL3uBTymqGA12+iZigInpIAPxhe1Tza4ULTePXPJw= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 h1:7Mw5kQDtMNIe97EJopWCwdNHOEDAIWYVbvjrwarodmQ= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6/go.mod h1:iLTIqAuD91w33X/4g1mbBeK0Oi3DLQOuqfuVqrLeTu8= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 h1:AKQMFS/Nd6KKwyeu/5U7JULe3TIFP10riB/V1RJBBgk= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6/go.mod h1:ncS65mbIKis7h5QYYGt/i6b1q6YSn8f46ZknRj3GeII= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 h1:bKEk3elksjR4B5OAngDK5dEIgUWfeYxBmpmlEzncQ+A= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6/go.mod h1:luPVd6SG2Xj0ESRoVko17VGyRlkGkhy658nPozOyCac= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 h1:HvIIXUuKpaVeBVmHkKBGB9AZamzDkMrzBSZYNpeO4Zo= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6/go.mod h1:K4ChYiTuODSLlfMCbfHG7UZ7XUpozprIx0/4vRNiDM4= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 h1:qNy6hwa2pSW+BN3Fq9N/KNSzlm5GtrEVqKV7gPOhPrg= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6/go.mod h1:+nGjNsTO6DbqA9ihSX9wvMMFZg2mVOxDTuRoa4AH1KQ= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 h1:y3gMhmVxlerzfeNgG9XfPY7Pw9H+EctcJsPNqIoNOUA= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6/go.mod h1:SF7SHuoUAQ9xw1vmFcF3I2cUedZLyyx+jXMckkv3jbM= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 h1:gYuKXzk6G2y8lLbWmDZv4wz5ZjBoyN8rMG1m0eT9hq0= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 h1:UNin36Rnd/6/zXNR/qo0CTq/r2GDD+HgBFWkC1lbp7I= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6/go.mod h1:pG905gicJdVeoAkX5+w8Vlf5YIFPsvrNiaFZO9p9gFU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 h1:qho+fj+KNtJXaZAi6g1fQCDY42RyVHzBwbcXK6+bIEA= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6/go.mod h1:vY/zZXlsi6d45o7MTOXvRI1pCuXboQzcJ1KndkoAIfU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 h1:2eCOKx5eGh/PSTLjD9WT7bx7j3DVihelYrPwtz1DpF4= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6/go.mod h1:GXACzKmOddiTT50LfNPeWy6qaXz0oFKvBia5tb/jL58= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 h1:tNhdyg874ZZtimgx7mX5dgj7pv4QoebpOlyxaaYThdo= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6/go.mod h1:lRdM0+XeOWXRMnEt7kEMaP2f7SreGZ3lTua3EShNfk4= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 h1:9Z7tL2As/k5xVKtdc7y7udittzNMY0L5cBiqz2WvOLM= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6/go.mod h1:MXbhVcvq9gvxOjd8jSRWl1gQNnTHflqXqogfvbeXT7k= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 h1:it53s8qoAMmPCEBFVrcVl3QKV0ElQXBAJfxUek3uC+8= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6/go.mod h1:DN6AQT2QbqZbqChoRx4Hd2szkbO17zX7OxwQt5PJA3k= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d h1:wdjJ+/tBYiFLwno+lBPP66rm5jIf6ycGPRr21ogBBzE= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d/go.mod h1:CHa8CY2k0/wZkx/4KPi/WU/0m5YCfWZI1SAs1imElMA= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 h1:36SealDqBpRc0AsbWuf0noV6Nc/1xID9MF3KV8eV+mM= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 h1:4KSg9nMgxGXuf7LRYQ211KOReW2qe0Bx+p4mGZytzZI= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4/go.mod h1:tkHMGP1ivmmkOc3qO5Tk8eiVet+WqpFlkYpqbRulT64= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 h1:n/7FaY8rqSE2sePYLmu5XPYS2Usv7oKTWLKtJz2BSvE= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 h1:z3R6FPPOJeCMoTpNxmTpqlZwwSCMKIrhJT/Cc0iMVW8= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6/go.mod h1:b+ThhJiUhK3AC19XnwXgraGlKIP4rPUSCPu229PusAE= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 h1:Hq2tQTaFcEJy9o1QFb9Ql/gm0uRzrYQkFEZGPVKLMHI= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3/go.mod h1:TOlu5v8b46+aW9h3KLZdOiwz3gJkoQerT3+F3st6ZRA= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 h1:ThBBkW9Sgp6u0UUWZDH0p+ZHGYwrM/vZPdVEvEBFUAc= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 h1:LkpNNFR3UMaWGbwVmkphw96fgGdgqvO8h9fAwABe42o= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4/go.mod h1:6uwVrNNEzdL2bczKAGjNitv91b35uJENDod+eTlah88= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4 h1:nKPi1R2w461Ad70F0uSbWYMQSrudCK+ipzDPwvsMu7U= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4/go.mod h1:rUYPK8Kj3NnJgkGGTFPqF6S6m2YVgD1ny9oRVBwdPr0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 h1:rvDDMMs2lsMG4RP9BXAdhySIONaQ29msx9Qcfj3jPW0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4/go.mod h1:ocHb4Lk0C6WIdLnp6ZZcvpgdYG639hnZkfopbCLOWAo= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 h1:to2j2pjJ7kN9LFIay7swUECLv9of+zG4azjMP4RnKRE= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4/go.mod h1:2UPUGBeQzxtjAZ2UhBVGYzalE72y7/WuvaJP2wi5G+g= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 h1:W4wwSuwCI1sQPVlEyEIkOEi17OQkuAAo00JWG3a8280= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4/go.mod h1:9887F1wbPDJ4k32J/osibBm4Dx1mf79qM3bvo9+/sqo= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 h1:96g1V6PQaA81ttboGrseIsTy/YXRuBjc/n/Od50JLLs= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4/go.mod h1:RSeEw2XF+jaW2bISKBp5jRgZfAmB+iiIUuRP+1kiAcw= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 h1:aBbAd+lnAckuAy7JlCvjRqXxMXe2gCGWhc5BlZeTBuM= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4/go.mod h1:GX8x5SLGXz4d2pXlO7MLQC8Jhc2dzpH1xjX9c0OLj+s= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 h1:ApOwzW4pyWmaadJZB1yYvOSnD0pZFoxiQTDIzb6eeqA= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4/go.mod h1:+BNG3ffJgTee+rkPltaeckrzTgtJ7Bmw+Y0bGlE7abs= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 h1:bMFx5bt7wmiNraARxHum72RPW09Yp+Q2/hF7IwKvOGU= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4/go.mod h1:6fzyY2f23A8eT/OuCdde43BUYTtw5xdY8M92LlSLAtI= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 h1:jLJBMZqFpoLq3eF36fcdjNgtTNbsLru4+4ulVz3rKiw= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4/go.mod h1:Vf19YCap4AXUAKFJXNXJX8AaNaaBTiznLzT3FbNZ9aQ= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 h1:6vYC6ib5egY3URacLettE8oQuYKUssKsjleGQSuqmFA= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4/go.mod h1:W3MkNNcILOrtx2e2Fv+4VNrUOP0uqrSax39i+zW6bSE= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 h1:WJuuko9WxaEY5/O7820MdiuOS/zfWLmCDJ5I70GzpJM= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4/go.mod h1:vFbjlkJvc6f3U8IDbQDUN2IHNfOmtyidbU9ZsPwVBDM= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 h1:6b4aTOXt0iCMUgKAvEM+EcOE2YJx9s7pRLGZk2tTUpc= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4/go.mod h1:r60+SPRvjEMYWAUPEDSM9TE3CeHhQdr/RMlQVRw/tvk= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 h1:T2cl+OaecGnc+LObbE4CdqmMBCAebH3CIbWRegYbddQ= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4/go.mod h1:gPi5PQHwQpKDX+eelStx/uIorwVbxvJ4KKM2f+SA9rQ= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 h1:RHwuqp+IMrKCYTE9Jo8wg2SgYMVzzjbucDvKQXSgCnM= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4/go.mod h1:wh9D6UK6G7WFMLHMB/HYgDEJQdRgyYVH8fzRraq/QBI= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 h1:IL0tVxPIPpkeuPYz1z3t28SfDI/oRkJaWMD5sVPyaQA= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 h1:Cj/NtIX2GtgP5SYDvxF8HE6kzkvpkWbiqMDQ+0J831Y= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4 h1:A8sWzhqbI56Ow1aS4XjvFbMhPK/Je7Vi4WBcN6zto+Q= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4/go.mod h1:xh+1p0cPMvgHG4PrmsHaagIXqynL/hwIF5Kjtx4aImA= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 h1:ga4n85LQfEhnhz2ThipT2XOqt+6TLXOaoNiluxD/W2w= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 h1:Sj8GB7554oXI7Ek6eDx9skrwWfnxzlaBzDuZCRCFSZg= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 h1:GJ+ba3Ah0W+v1kh98+D6JaUfduJhDBCnlhK3wrhj9YI= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 h1:zFGqASkFXZeL49KHNCu7imxFOYsIhAypRXtuOpSqtF0= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4/go.mod h1:JqwmxL8i5xU/k7iKpE1LMhDxdYdL2yEUTY5IETlG+QM= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 h1:OU1bNaISmExhvf1UCDVN9ccoVajxqOvOh2twSRgdaHw= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 h1:pb77YxVpsyT5gX2sbJqDtJQRRBOm4q7JNPWKajdg8Vk= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6/go.mod h1:kS8TDCdO0gvl2BMRL/0XpsWR/cEnDy+HI7ZtuWPUVo8= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6 h1:eYpXZ1sn+ljObazwgUIIRcJcEjNDlYfkjrCTCYmJ/b4= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6/go.mod h1:fus2khOw7APls2ZgIwdqVjA7nq+YMlOsiIivruXI0BM= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 h1:OjyXksyVjttCZWDGm6/LNX6YyxjqllnQr6oxuhhbv9Y= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6/go.mod h1:MLm5dh6z8ZQabiJq5NKr0A/0OQMjzcYQ8KWtCy56/GQ= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 h1:eTzuTY1hcfyPKq50UdevLF4MtFUMWh14ICsTHuM38zo= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6/go.mod h1:19YxHi3uNleq4GqHtzBcGwUTuwWKDq2EHjbqoEjgVBA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 h1:i0hTL9y6kBs55ItixfSm/gW1URCZoww3sxPBwiI5sFA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6/go.mod h1:TO6lxOK2W3rYsYbXXggQxKFvyq7lBP+BKz0/wfWq/LQ= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 h1:149QCTyg2nzYLt3bSaAVA8MlOg5mOrlrp7LMqyzSSt8= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6/go.mod h1:iKaCYetHU3IEV06SL2I0C5GvB5vF8+8v0jJuPCP5ux4= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 h1:uYOJhYhdQeQK+wvrogjce+YefaizdIL4PiOZAeCPHDU= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6/go.mod h1:qo+6psfbEWHj4OoPdaoUgPXO6e+f4rS0lqSwDUJKWAY= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 h1:YZHYQIcRR3N3/mM6s/0kEle1MKl3Kh+CVH0+sTRld98= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6/go.mod h1:KZxnmkdM3WiECe85Vkb808UDPNDnQV5+g1ehJn/Gyic= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 h1:uFhDhOgTC5uAvPa36CbyQ9hMpuX3Zf/PqXGq7at1FVU= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6/go.mod h1:gSE/BdDCYIFQMvQfyQyCDR8BfypxHZK1laqlbV/fqNI= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 h1:xqwHjzMcRvYeB6QjUYumOZzVBI6fpw4ikcBhMIQyiEU= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6/go.mod h1:sgzO75jq8IYXUbFzV+7XcZI5trBXNCilaqHXcZVQgMg= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 h1:OMxPtCNvW3MoEy8Nr54RjOPJF6pCN8PN0FW9fuW8Vzo= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6/go.mod h1:4/IgGNdC75iefcBc2LEMr9U0J/Eoj6tjFAhVmRoOfzI= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 h1:sMCW+l/t4pAlzMZklxXuVu0K84av+nL8liav116qrgc= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6/go.mod h1:urtlvCbtXEcuawxhFxTtcSV8dJXPfXFrBZKcdv0WF2A= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 h1:FuiSExW/kMGJXVbZ79vTML+elgvLnbf75tBx7qyFdyY= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6/go.mod h1:4Z/dg0+t11prtrrztedCPJ+oTK2PLpBaVMkU+8WIdPw= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 h1:ZAmq/QB3lZjTfydN860PH2frLmOoLB6YnSOspEhpCxs= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6/go.mod h1:ObJFyZpxENGOCL+Q/8+mZWlZxcV9wls6clr8c9JIDTY= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 h1:4fkw2/jImZdRrtG0NXhFDAj4CSpyEEyBsEQg7cIiM7c= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6/go.mod h1:8Dz2robkpfeJqbkZrBE1nrCaTEMfcGp8t8l2n9VexnQ= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 h1:BtsjxKQP7oH0buBJLnjPF4OHfUHow2q4LXsmqkSniI0= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 h1:35B7SqLMMt+haFDAx2RVLtVamEmNa16mOh7k5yDFBKU= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6 h1:yuShxJ13INdeYYH60M1DvZGAGBIrbqyfwX1qSD3l8yY= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6/go.mod h1:wQe4Ppzqh6jnmhZZjTozY06KsQ3AErT/65kstm6jHaE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 h1:fmIyoWn7HHVOK6RCizXmJtCjmPnShRTRBgtdEnoT6PQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 h1:yKfzVgRiwit8NTZR0iJ7d1e+7D155+VphNe5ci0v7h4= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 h1:l6vgnYVtUg86zBSc4z8rMMA0z86ADfi/3/HOhsnpgQc= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 h1:QY8IhqW9t6nXlg6HxURhFOT5GFHCpbNTyoffbDe6bbU= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6/go.mod h1:rUexndyX0/drZbyDBS/ySjOZv/sdbyCy/e+i+vjME60= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f h1:qhko+fLzYmtbqHkgT/GbShyTLAmq5MFeYbknldWsPDs= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f/go.mod h1:2NvzQC8eTtIHI94ymG1UqXZanSXlL3KOiZ5oIoTAdsI= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 h1:ENtyvawVW48h2/zKSskTqVGTb+A+28tQPFeKPl60T2g= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 h1:Oto2Xy/YbirVWVP14Tc7ZNraVrTe9keuT3m1VDhe63s= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4/go.mod h1:oFNxu8w44yImFD3eQyfmtaN8Dcn7k31+QnBXpE9DJkc= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 h1:YHBcs8eeNWQqtX79xuIbJDNzcwjKShObBCNsE4Q1NNA= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 h1:f/6Fv8J7o/NX+ohk36b7OeCRf6E8SeM/Ia6wrysLA/Q= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4/go.mod h1:b31C70BF+erIi8UAhvZ5lltxr79RYlVyQSeIbQAmBZI= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 h1:sQc3B3rAaC2sppYl+jHu9TRpKD49jOpNWt8m0NmcM5Q= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4/go.mod h1:n/EeRNU8/JaU1Jbsbru6ul0sLuW0H0VimMnmDZX3cGU= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 h1:/9A3Ef/pUlygTRVg5GpDPh86wjQxne3bndQRir/FoFY= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4/go.mod h1:Yel4HfEYB15LI0G5NgO9n35v5F8GfrP/6V+kuZGOvXg= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 h1:bRL2CFOXVSMz8X2799naoFeyovXlD0jqazEd/eybrzQ= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4/go.mod h1:af4ZmImSYQtNfoRamUTYOMo5NsOiRNdMxE+Ng7ldits= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 h1:BviquFfVz0JY8Ou8Ra84duhgd4XFpiHdmeZb3E2OHkw= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4/go.mod h1:r+M7l7K5GkvznIdLLxh6edDSgrS5Ncwuvh8UP6FfMZ4= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 h1:r7meov0lv45F2Ct30sRizZGWYqUX6TqaVFPl7AEdSKw= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 h1:LdCGAX+GFA5iy2Jl+3+tdBYwaQCDYa+fJ9bq0djtxQ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 h1:4HAlPx6EWkgb/NcbQZXD8YP61hlFk3Mpy+a8ihw7VS0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 h1:2xa1Fvm3/kzCz64tklaJx5JUlgZMnSLvFzJwDRhiCBU= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 h1:liTie/WZnLsizRFZ4/pS1LGzPKA+67iA2b33v9JEN5o= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 h1:MI50jVYeoXbrjGaCvVg51HFKVpMp7/9+T7p6qsVQ9lw= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4/go.mod h1:LjVkZvONaQdyIXZ/w1NoJ2XjGK8Hd+a5lAQpfE893Hk= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 h1:eenwM6MlHyQ6LGveUgwR1R2g0deUuznNG9Ggiwf4+OE= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4 h1:evbwHpEUAcvYXknhzvDwzzFhCMIjMo3peZaCsscJu0s= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 h1:nD3BpXisIP+2ymcvXs7nObfxNvp5GZpEQYc3Uj2i1L4= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4/go.mod h1:8Nj/lUHSxAVz/Sc5n0tnHXgWEOmwPRHuMl7QElaYibI= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 h1:9v0R6W1bsj9PU2WcYOh155MiRxw8ec3ELEVl/ze3DmU= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 h1:nAQ0IxRzcz/wSMIAf6JkjWaPZ8e1PIHCrHNrE9sRNM4= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 h1:686C9eoF82jeKmFqOpgAzHinbWkm24xSeUPV3IpHQF0= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6/go.mod h1:ENrY8lv3RBn9dBXtYu9rVApfnUDvPpdk4Wkkm+jXBJY= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 h1:wKBXTEBgNueKU77Zi8gGK78gMBU2eNV+tkWGJfq8sTU= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 h1:PgqDXJ5MH/QgZdav3ceaqgQJluwrH/t/fuv9wCDt3PI= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6/go.mod h1:iWuaAayud9iJBlnfQqBEmQyQs4mbjeSWvZ9tr3YXDDc= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 h1:/0VRtMBRwVr/ogt7Tamb5oQ3XCumTl5lOdlk5Uc6KBM= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6/go.mod h1:z1j32phXt8lVa0n5kQaFi8P2mtjDhQmSZcNBn5Pf/9w= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 h1:CyWPUqh+uYao32xV1mG5l1osnUZEbe8ejTHDn4Bs860= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6/go.mod h1:dtwg8dtia1iqhoftFD24ZWayKOdHdDZWymA0BTcyLvE= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 h1:EyjE4yiZHfnXgicYnfiqTNOaFfeCwNiH3jV/GUq/es4= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6/go.mod h1:LAIr/bbTppGIAjy7EZXUU5pxu7e3If83OO+8SKKQx3U= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 h1:rwnbc2e/DLw56CKgzs/Ibqer5ShjA1V8olnmekcmC+Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6/go.mod h1:Hiyb6L8eoZjCZgHTDOzoXTo0NqgHH5gX0EcomHr7QiA= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 h1:6kBc7L0BZ11htsNyclCJaN5IUi0EHPbauki3/wdXPwU= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 h1:POsiTWzdyV9gkTFAK3pGBIwRwGAAdGIqv2u76zafQY4= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 h1:/mXOc644CYBtA2Ck3oJNF7VfYbjOfAzKhtSLd2tFu3U= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 h1:lljXGdvEEOVxUAiltMI2i1hPj7cOlUQm/Sl5Ofw9ZHo= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 h1:yVRtV3MChW9ZrcMn+xcgzJ0r/CMJ2MfoZgwK+cy7OA4= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 h1:WbLpNspSnYFbtYUKtevdiawt9/nvEahdrmqroYuzaos= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6/go.mod h1:6YNUIA0LejPEjdlbHwMfY2vKTYfR2IjA5EaOk0bUWow= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 h1:fIjm7+gXZCFxKNQQDQUXsFL5lXR3VAsvCiyLugomNOw= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6 h1:EeA2wDREGCbeIk6UFyLZ/jdFm6itmDisiwrbHvIFMIY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 h1:spJRfOwJrCeJXWEzFvjZD+Vvsr1q/jiaxpIIchqTlfs= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6/go.mod h1:KsUItPqRj8C6oHipUNr0Q/bUzwaeQ4SVeQ58uK6HsT4= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 h1:RqOa8G/MlCoH4Joxumu5JXVqNXl1+l2hHm9VluBbt7w= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 215f988286f3..d74c988b70e7 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -3,31 +3,31 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datado go 1.21.0 require ( - github.com/DataDog/agent-payload/v5 v5.0.124 - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 + github.com/DataDog/agent-payload/v5 v5.0.125 + github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d - github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 - github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 + github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 github.com/DataDog/datadog-go/v5 v5.5.0 github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.17.0 @@ -100,40 +100,40 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect github.com/DataDog/go-sqllexer v0.0.12 // indirect github.com/DataDog/go-tuf v1.1.0-0.5.2 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index f6bd18e98466..6be3d1c2638e 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -73,136 +73,136 @@ 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/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.124 h1:m7MLSy8oyLQDT59oesWhZiSFDzV/Q9CWzhue7s2SFaw= -github.com/DataDog/agent-payload/v5 v5.0.124/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4 h1:B34pJWfJ2kgaA30FoUoDUVDCca8hqi+kF7roUNyR8fs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4/go.mod h1:tPiFyIyrV0aneNrCY/fcyXo0GJadipU+aaIvoIWc6So= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4 h1:WzYTLPvFJ988nkONrR70ZwRGtOsqg+mmN3o21+YQd0U= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 h1:MWSdTnKhrex23ogDnwZGAk2OHFg2Nnp1CHWHtVrSruc= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4/go.mod h1:HgBvWpUeiM6yQWinv5lC7ERwpSJSb2dvxjnXeRHJ4r8= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 h1:L7Cvcp7xNyGpCGvrOh09F/JcnU1hvRSAS229XuIU04o= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4/go.mod h1:xTcCh6NEMd3QSsGYFFCoSwSE5Jg02OiVTD5VkP2V4hU= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 h1:CRJ47Lr2nqci6FC0gFK06MgQDT6l0iqO3EVXIynpAVw= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4/go.mod h1:roYYeTLsTH6Hd4p7virGlOUmgj37xa2CyM1fwgB0kmc= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 h1:sPj08c37dNUHZqUf3YtYsMRSb09ff8H8cdg1ZfpEziM= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4/go.mod h1:8XkiPzlYf9SGoh8rBjBW+MI2m+FOZdsuW+KQrzadJ7w= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 h1:1PwVhlPJaK3eeRx2oItbuye9r4+Bkt4c4Rdp6vjf0rM= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4/go.mod h1:e/hjXQITP8HoLdV6wbTf3mlqDTPnCJUYj2+VEHGiqeI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 h1:P30SsL1Sy417bD6OhcmyYIooCqU3dsE9y56kZ+iZ6aI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4/go.mod h1:hFJwvCOvHGzjwGCyM3BqQ3t9TF2gDypkoYbSsbNgQs0= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 h1:Y28aOfvmc6ces18bHBsoZOzRT6xytp4H7XmPDDsKlfA= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4/go.mod h1:ir8z0B+Ab8fM66MuraFyRbNHAj8NZxPkKvuf/uhPrYs= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 h1:BDFW8jh+tgIjZG6ItniePPlYdiOyeArWbgs5I9d3j+w= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 h1:yTU8MqnX3C78veSRdcTkySwj94/9gatxRczcNzYGEqA= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4/go.mod h1:1IZjuOSQ76J1oobrVtwGvuBBtHm9tpx29VZdDebSSQI= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 h1:Vcf20HV1hVcdTnJORMBj9gi4JmNJVdqC3gFPobxHXWc= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4/go.mod h1:eansf2vENM4gAWeOBXL+8szwQHyIxuNo9PVIygvhI54= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 h1:m/V/ngMk3NtRvudl3912876XBc/f/z9qZutf3TTZvKA= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4/go.mod h1:ifREGSm6GTGn3oB8vGgwnMHeW2/BIbiThW3URd755GM= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 h1:MDcx5ATdVVp2unsGlRO3J9lmarFveTiT2m0QD1zpxN0= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4/go.mod h1:IQ0aKL3gkJUW2FwIeKK/TaGrgX6T19vkDNtTyvcoHPQ= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 h1:UXBgAgKPPMMx44yE3wecI7n9zj1gj++xQ5NhHTFmdgA= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4/go.mod h1:MM8Vmewv4+knZUX+dr0HMbQywmu8LeIH4igS5uZrUko= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 h1:kvCbL+lKGyNaxDxE8wvfxNCMyvJxa4VeBikm8tRJ/i4= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4/go.mod h1:xhZoGJAEXEXh0NfLd5mWq1uQElC4Nr5c+9a/FWsfQ5w= +github.com/DataDog/agent-payload/v5 v5.0.125 h1:ZMlATwFarkDkr3aKyDI5UKPtZxXd9/Jsk5v28ncGx4c= +github.com/DataDog/agent-payload/v5 v5.0.125/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6 h1:LtB5es6u46jYOBdM8n79fClUV2o6Skn65ULSDvWlTyA= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6/go.mod h1:Sa8nnkFInG63Zpw1jN3AQoBPkLH+dNe6YJ1f8a8B2zw= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6 h1:OLwcYbBhedl3bqhboskVNfCIhNGXt9v4vZQ23ortFkA= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 h1:zVmIDZ/gTi6YEHB1xa1UEZUvROak1jR5NmEvmMaznHI= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6/go.mod h1:qSeL3uBTymqGA12+iZigInpIAPxhe1Tza4ULTePXPJw= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 h1:7Mw5kQDtMNIe97EJopWCwdNHOEDAIWYVbvjrwarodmQ= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6/go.mod h1:iLTIqAuD91w33X/4g1mbBeK0Oi3DLQOuqfuVqrLeTu8= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 h1:AKQMFS/Nd6KKwyeu/5U7JULe3TIFP10riB/V1RJBBgk= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6/go.mod h1:ncS65mbIKis7h5QYYGt/i6b1q6YSn8f46ZknRj3GeII= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 h1:bKEk3elksjR4B5OAngDK5dEIgUWfeYxBmpmlEzncQ+A= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6/go.mod h1:luPVd6SG2Xj0ESRoVko17VGyRlkGkhy658nPozOyCac= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 h1:HvIIXUuKpaVeBVmHkKBGB9AZamzDkMrzBSZYNpeO4Zo= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6/go.mod h1:K4ChYiTuODSLlfMCbfHG7UZ7XUpozprIx0/4vRNiDM4= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 h1:qNy6hwa2pSW+BN3Fq9N/KNSzlm5GtrEVqKV7gPOhPrg= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6/go.mod h1:+nGjNsTO6DbqA9ihSX9wvMMFZg2mVOxDTuRoa4AH1KQ= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 h1:y3gMhmVxlerzfeNgG9XfPY7Pw9H+EctcJsPNqIoNOUA= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6/go.mod h1:SF7SHuoUAQ9xw1vmFcF3I2cUedZLyyx+jXMckkv3jbM= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 h1:gYuKXzk6G2y8lLbWmDZv4wz5ZjBoyN8rMG1m0eT9hq0= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 h1:UNin36Rnd/6/zXNR/qo0CTq/r2GDD+HgBFWkC1lbp7I= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6/go.mod h1:pG905gicJdVeoAkX5+w8Vlf5YIFPsvrNiaFZO9p9gFU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 h1:qho+fj+KNtJXaZAi6g1fQCDY42RyVHzBwbcXK6+bIEA= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6/go.mod h1:vY/zZXlsi6d45o7MTOXvRI1pCuXboQzcJ1KndkoAIfU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 h1:2eCOKx5eGh/PSTLjD9WT7bx7j3DVihelYrPwtz1DpF4= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6/go.mod h1:GXACzKmOddiTT50LfNPeWy6qaXz0oFKvBia5tb/jL58= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 h1:tNhdyg874ZZtimgx7mX5dgj7pv4QoebpOlyxaaYThdo= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6/go.mod h1:lRdM0+XeOWXRMnEt7kEMaP2f7SreGZ3lTua3EShNfk4= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 h1:9Z7tL2As/k5xVKtdc7y7udittzNMY0L5cBiqz2WvOLM= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6/go.mod h1:MXbhVcvq9gvxOjd8jSRWl1gQNnTHflqXqogfvbeXT7k= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 h1:it53s8qoAMmPCEBFVrcVl3QKV0ElQXBAJfxUek3uC+8= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6/go.mod h1:DN6AQT2QbqZbqChoRx4Hd2szkbO17zX7OxwQt5PJA3k= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d h1:wdjJ+/tBYiFLwno+lBPP66rm5jIf6ycGPRr21ogBBzE= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d/go.mod h1:CHa8CY2k0/wZkx/4KPi/WU/0m5YCfWZI1SAs1imElMA= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 h1:36SealDqBpRc0AsbWuf0noV6Nc/1xID9MF3KV8eV+mM= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 h1:4KSg9nMgxGXuf7LRYQ211KOReW2qe0Bx+p4mGZytzZI= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4/go.mod h1:tkHMGP1ivmmkOc3qO5Tk8eiVet+WqpFlkYpqbRulT64= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 h1:n/7FaY8rqSE2sePYLmu5XPYS2Usv7oKTWLKtJz2BSvE= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 h1:z3R6FPPOJeCMoTpNxmTpqlZwwSCMKIrhJT/Cc0iMVW8= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6/go.mod h1:b+ThhJiUhK3AC19XnwXgraGlKIP4rPUSCPu229PusAE= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 h1:Hq2tQTaFcEJy9o1QFb9Ql/gm0uRzrYQkFEZGPVKLMHI= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3/go.mod h1:TOlu5v8b46+aW9h3KLZdOiwz3gJkoQerT3+F3st6ZRA= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 h1:ThBBkW9Sgp6u0UUWZDH0p+ZHGYwrM/vZPdVEvEBFUAc= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 h1:LkpNNFR3UMaWGbwVmkphw96fgGdgqvO8h9fAwABe42o= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4/go.mod h1:6uwVrNNEzdL2bczKAGjNitv91b35uJENDod+eTlah88= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4 h1:nKPi1R2w461Ad70F0uSbWYMQSrudCK+ipzDPwvsMu7U= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4/go.mod h1:rUYPK8Kj3NnJgkGGTFPqF6S6m2YVgD1ny9oRVBwdPr0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 h1:rvDDMMs2lsMG4RP9BXAdhySIONaQ29msx9Qcfj3jPW0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4/go.mod h1:ocHb4Lk0C6WIdLnp6ZZcvpgdYG639hnZkfopbCLOWAo= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 h1:to2j2pjJ7kN9LFIay7swUECLv9of+zG4azjMP4RnKRE= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4/go.mod h1:2UPUGBeQzxtjAZ2UhBVGYzalE72y7/WuvaJP2wi5G+g= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 h1:W4wwSuwCI1sQPVlEyEIkOEi17OQkuAAo00JWG3a8280= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4/go.mod h1:9887F1wbPDJ4k32J/osibBm4Dx1mf79qM3bvo9+/sqo= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 h1:96g1V6PQaA81ttboGrseIsTy/YXRuBjc/n/Od50JLLs= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4/go.mod h1:RSeEw2XF+jaW2bISKBp5jRgZfAmB+iiIUuRP+1kiAcw= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 h1:aBbAd+lnAckuAy7JlCvjRqXxMXe2gCGWhc5BlZeTBuM= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4/go.mod h1:GX8x5SLGXz4d2pXlO7MLQC8Jhc2dzpH1xjX9c0OLj+s= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 h1:ApOwzW4pyWmaadJZB1yYvOSnD0pZFoxiQTDIzb6eeqA= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4/go.mod h1:+BNG3ffJgTee+rkPltaeckrzTgtJ7Bmw+Y0bGlE7abs= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 h1:bMFx5bt7wmiNraARxHum72RPW09Yp+Q2/hF7IwKvOGU= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4/go.mod h1:6fzyY2f23A8eT/OuCdde43BUYTtw5xdY8M92LlSLAtI= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 h1:jLJBMZqFpoLq3eF36fcdjNgtTNbsLru4+4ulVz3rKiw= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4/go.mod h1:Vf19YCap4AXUAKFJXNXJX8AaNaaBTiznLzT3FbNZ9aQ= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 h1:6vYC6ib5egY3URacLettE8oQuYKUssKsjleGQSuqmFA= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4/go.mod h1:W3MkNNcILOrtx2e2Fv+4VNrUOP0uqrSax39i+zW6bSE= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 h1:WJuuko9WxaEY5/O7820MdiuOS/zfWLmCDJ5I70GzpJM= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4/go.mod h1:vFbjlkJvc6f3U8IDbQDUN2IHNfOmtyidbU9ZsPwVBDM= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 h1:6b4aTOXt0iCMUgKAvEM+EcOE2YJx9s7pRLGZk2tTUpc= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4/go.mod h1:r60+SPRvjEMYWAUPEDSM9TE3CeHhQdr/RMlQVRw/tvk= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 h1:T2cl+OaecGnc+LObbE4CdqmMBCAebH3CIbWRegYbddQ= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4/go.mod h1:gPi5PQHwQpKDX+eelStx/uIorwVbxvJ4KKM2f+SA9rQ= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 h1:RHwuqp+IMrKCYTE9Jo8wg2SgYMVzzjbucDvKQXSgCnM= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4/go.mod h1:wh9D6UK6G7WFMLHMB/HYgDEJQdRgyYVH8fzRraq/QBI= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 h1:IL0tVxPIPpkeuPYz1z3t28SfDI/oRkJaWMD5sVPyaQA= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 h1:Cj/NtIX2GtgP5SYDvxF8HE6kzkvpkWbiqMDQ+0J831Y= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4 h1:A8sWzhqbI56Ow1aS4XjvFbMhPK/Je7Vi4WBcN6zto+Q= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4/go.mod h1:xh+1p0cPMvgHG4PrmsHaagIXqynL/hwIF5Kjtx4aImA= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 h1:ga4n85LQfEhnhz2ThipT2XOqt+6TLXOaoNiluxD/W2w= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 h1:Sj8GB7554oXI7Ek6eDx9skrwWfnxzlaBzDuZCRCFSZg= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 h1:GJ+ba3Ah0W+v1kh98+D6JaUfduJhDBCnlhK3wrhj9YI= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 h1:zFGqASkFXZeL49KHNCu7imxFOYsIhAypRXtuOpSqtF0= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4/go.mod h1:JqwmxL8i5xU/k7iKpE1LMhDxdYdL2yEUTY5IETlG+QM= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 h1:OU1bNaISmExhvf1UCDVN9ccoVajxqOvOh2twSRgdaHw= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 h1:pb77YxVpsyT5gX2sbJqDtJQRRBOm4q7JNPWKajdg8Vk= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6/go.mod h1:kS8TDCdO0gvl2BMRL/0XpsWR/cEnDy+HI7ZtuWPUVo8= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6 h1:eYpXZ1sn+ljObazwgUIIRcJcEjNDlYfkjrCTCYmJ/b4= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6/go.mod h1:fus2khOw7APls2ZgIwdqVjA7nq+YMlOsiIivruXI0BM= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 h1:OjyXksyVjttCZWDGm6/LNX6YyxjqllnQr6oxuhhbv9Y= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6/go.mod h1:MLm5dh6z8ZQabiJq5NKr0A/0OQMjzcYQ8KWtCy56/GQ= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 h1:eTzuTY1hcfyPKq50UdevLF4MtFUMWh14ICsTHuM38zo= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6/go.mod h1:19YxHi3uNleq4GqHtzBcGwUTuwWKDq2EHjbqoEjgVBA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 h1:i0hTL9y6kBs55ItixfSm/gW1URCZoww3sxPBwiI5sFA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6/go.mod h1:TO6lxOK2W3rYsYbXXggQxKFvyq7lBP+BKz0/wfWq/LQ= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 h1:149QCTyg2nzYLt3bSaAVA8MlOg5mOrlrp7LMqyzSSt8= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6/go.mod h1:iKaCYetHU3IEV06SL2I0C5GvB5vF8+8v0jJuPCP5ux4= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 h1:uYOJhYhdQeQK+wvrogjce+YefaizdIL4PiOZAeCPHDU= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6/go.mod h1:qo+6psfbEWHj4OoPdaoUgPXO6e+f4rS0lqSwDUJKWAY= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 h1:YZHYQIcRR3N3/mM6s/0kEle1MKl3Kh+CVH0+sTRld98= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6/go.mod h1:KZxnmkdM3WiECe85Vkb808UDPNDnQV5+g1ehJn/Gyic= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 h1:uFhDhOgTC5uAvPa36CbyQ9hMpuX3Zf/PqXGq7at1FVU= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6/go.mod h1:gSE/BdDCYIFQMvQfyQyCDR8BfypxHZK1laqlbV/fqNI= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 h1:xqwHjzMcRvYeB6QjUYumOZzVBI6fpw4ikcBhMIQyiEU= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6/go.mod h1:sgzO75jq8IYXUbFzV+7XcZI5trBXNCilaqHXcZVQgMg= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 h1:OMxPtCNvW3MoEy8Nr54RjOPJF6pCN8PN0FW9fuW8Vzo= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6/go.mod h1:4/IgGNdC75iefcBc2LEMr9U0J/Eoj6tjFAhVmRoOfzI= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 h1:sMCW+l/t4pAlzMZklxXuVu0K84av+nL8liav116qrgc= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6/go.mod h1:urtlvCbtXEcuawxhFxTtcSV8dJXPfXFrBZKcdv0WF2A= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 h1:FuiSExW/kMGJXVbZ79vTML+elgvLnbf75tBx7qyFdyY= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6/go.mod h1:4Z/dg0+t11prtrrztedCPJ+oTK2PLpBaVMkU+8WIdPw= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 h1:ZAmq/QB3lZjTfydN860PH2frLmOoLB6YnSOspEhpCxs= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6/go.mod h1:ObJFyZpxENGOCL+Q/8+mZWlZxcV9wls6clr8c9JIDTY= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 h1:4fkw2/jImZdRrtG0NXhFDAj4CSpyEEyBsEQg7cIiM7c= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6/go.mod h1:8Dz2robkpfeJqbkZrBE1nrCaTEMfcGp8t8l2n9VexnQ= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 h1:BtsjxKQP7oH0buBJLnjPF4OHfUHow2q4LXsmqkSniI0= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 h1:35B7SqLMMt+haFDAx2RVLtVamEmNa16mOh7k5yDFBKU= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6 h1:yuShxJ13INdeYYH60M1DvZGAGBIrbqyfwX1qSD3l8yY= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6/go.mod h1:wQe4Ppzqh6jnmhZZjTozY06KsQ3AErT/65kstm6jHaE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 h1:fmIyoWn7HHVOK6RCizXmJtCjmPnShRTRBgtdEnoT6PQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 h1:yKfzVgRiwit8NTZR0iJ7d1e+7D155+VphNe5ci0v7h4= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 h1:l6vgnYVtUg86zBSc4z8rMMA0z86ADfi/3/HOhsnpgQc= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 h1:QY8IhqW9t6nXlg6HxURhFOT5GFHCpbNTyoffbDe6bbU= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6/go.mod h1:rUexndyX0/drZbyDBS/ySjOZv/sdbyCy/e+i+vjME60= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f h1:qhko+fLzYmtbqHkgT/GbShyTLAmq5MFeYbknldWsPDs= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f/go.mod h1:2NvzQC8eTtIHI94ymG1UqXZanSXlL3KOiZ5oIoTAdsI= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 h1:ENtyvawVW48h2/zKSskTqVGTb+A+28tQPFeKPl60T2g= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 h1:Oto2Xy/YbirVWVP14Tc7ZNraVrTe9keuT3m1VDhe63s= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4/go.mod h1:oFNxu8w44yImFD3eQyfmtaN8Dcn7k31+QnBXpE9DJkc= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 h1:YHBcs8eeNWQqtX79xuIbJDNzcwjKShObBCNsE4Q1NNA= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 h1:f/6Fv8J7o/NX+ohk36b7OeCRf6E8SeM/Ia6wrysLA/Q= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4/go.mod h1:b31C70BF+erIi8UAhvZ5lltxr79RYlVyQSeIbQAmBZI= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 h1:sQc3B3rAaC2sppYl+jHu9TRpKD49jOpNWt8m0NmcM5Q= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4/go.mod h1:n/EeRNU8/JaU1Jbsbru6ul0sLuW0H0VimMnmDZX3cGU= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 h1:/9A3Ef/pUlygTRVg5GpDPh86wjQxne3bndQRir/FoFY= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4/go.mod h1:Yel4HfEYB15LI0G5NgO9n35v5F8GfrP/6V+kuZGOvXg= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 h1:bRL2CFOXVSMz8X2799naoFeyovXlD0jqazEd/eybrzQ= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4/go.mod h1:af4ZmImSYQtNfoRamUTYOMo5NsOiRNdMxE+Ng7ldits= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 h1:BviquFfVz0JY8Ou8Ra84duhgd4XFpiHdmeZb3E2OHkw= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4/go.mod h1:r+M7l7K5GkvznIdLLxh6edDSgrS5Ncwuvh8UP6FfMZ4= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 h1:r7meov0lv45F2Ct30sRizZGWYqUX6TqaVFPl7AEdSKw= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 h1:LdCGAX+GFA5iy2Jl+3+tdBYwaQCDYa+fJ9bq0djtxQ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 h1:4HAlPx6EWkgb/NcbQZXD8YP61hlFk3Mpy+a8ihw7VS0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 h1:2xa1Fvm3/kzCz64tklaJx5JUlgZMnSLvFzJwDRhiCBU= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 h1:liTie/WZnLsizRFZ4/pS1LGzPKA+67iA2b33v9JEN5o= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 h1:MI50jVYeoXbrjGaCvVg51HFKVpMp7/9+T7p6qsVQ9lw= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4/go.mod h1:LjVkZvONaQdyIXZ/w1NoJ2XjGK8Hd+a5lAQpfE893Hk= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 h1:eenwM6MlHyQ6LGveUgwR1R2g0deUuznNG9Ggiwf4+OE= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4 h1:evbwHpEUAcvYXknhzvDwzzFhCMIjMo3peZaCsscJu0s= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 h1:nD3BpXisIP+2ymcvXs7nObfxNvp5GZpEQYc3Uj2i1L4= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4/go.mod h1:8Nj/lUHSxAVz/Sc5n0tnHXgWEOmwPRHuMl7QElaYibI= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 h1:9v0R6W1bsj9PU2WcYOh155MiRxw8ec3ELEVl/ze3DmU= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 h1:nAQ0IxRzcz/wSMIAf6JkjWaPZ8e1PIHCrHNrE9sRNM4= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 h1:686C9eoF82jeKmFqOpgAzHinbWkm24xSeUPV3IpHQF0= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6/go.mod h1:ENrY8lv3RBn9dBXtYu9rVApfnUDvPpdk4Wkkm+jXBJY= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 h1:wKBXTEBgNueKU77Zi8gGK78gMBU2eNV+tkWGJfq8sTU= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 h1:PgqDXJ5MH/QgZdav3ceaqgQJluwrH/t/fuv9wCDt3PI= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6/go.mod h1:iWuaAayud9iJBlnfQqBEmQyQs4mbjeSWvZ9tr3YXDDc= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 h1:/0VRtMBRwVr/ogt7Tamb5oQ3XCumTl5lOdlk5Uc6KBM= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6/go.mod h1:z1j32phXt8lVa0n5kQaFi8P2mtjDhQmSZcNBn5Pf/9w= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 h1:CyWPUqh+uYao32xV1mG5l1osnUZEbe8ejTHDn4Bs860= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6/go.mod h1:dtwg8dtia1iqhoftFD24ZWayKOdHdDZWymA0BTcyLvE= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 h1:EyjE4yiZHfnXgicYnfiqTNOaFfeCwNiH3jV/GUq/es4= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6/go.mod h1:LAIr/bbTppGIAjy7EZXUU5pxu7e3If83OO+8SKKQx3U= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 h1:rwnbc2e/DLw56CKgzs/Ibqer5ShjA1V8olnmekcmC+Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6/go.mod h1:Hiyb6L8eoZjCZgHTDOzoXTo0NqgHH5gX0EcomHr7QiA= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 h1:6kBc7L0BZ11htsNyclCJaN5IUi0EHPbauki3/wdXPwU= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 h1:POsiTWzdyV9gkTFAK3pGBIwRwGAAdGIqv2u76zafQY4= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 h1:/mXOc644CYBtA2Ck3oJNF7VfYbjOfAzKhtSLd2tFu3U= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 h1:lljXGdvEEOVxUAiltMI2i1hPj7cOlUQm/Sl5Ofw9ZHo= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 h1:yVRtV3MChW9ZrcMn+xcgzJ0r/CMJ2MfoZgwK+cy7OA4= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 h1:WbLpNspSnYFbtYUKtevdiawt9/nvEahdrmqroYuzaos= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6/go.mod h1:6YNUIA0LejPEjdlbHwMfY2vKTYfR2IjA5EaOk0bUWow= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 h1:fIjm7+gXZCFxKNQQDQUXsFL5lXR3VAsvCiyLugomNOw= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6 h1:EeA2wDREGCbeIk6UFyLZ/jdFm6itmDisiwrbHvIFMIY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 h1:spJRfOwJrCeJXWEzFvjZD+Vvsr1q/jiaxpIIchqTlfs= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6/go.mod h1:KsUItPqRj8C6oHipUNr0Q/bUzwaeQ4SVeQ58uK6HsT4= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 h1:RqOa8G/MlCoH4Joxumu5JXVqNXl1+l2hHm9VluBbt7w= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 82bf59a1198e..c55306291495 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -4,7 +4,7 @@ go 1.21.0 require ( github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.105.0 @@ -33,63 +33,63 @@ require ( require ( cloud.google.com/go/compute/metadata v0.5.0 // indirect - github.com/DataDog/agent-payload/v5 v5.0.124 // indirect - github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 // indirect + github.com/DataDog/agent-payload/v5 v5.0.125 // indirect + github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f // indirect - github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 // indirect - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 // indirect + github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 // indirect github.com/DataDog/datadog-go/v5 v5.5.0 // indirect github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe // indirect github.com/DataDog/go-sqllexer v0.0.12 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 22bc6f99fb07..9641a25b6630 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -66,136 +66,136 @@ 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/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/agent-payload/v5 v5.0.124 h1:m7MLSy8oyLQDT59oesWhZiSFDzV/Q9CWzhue7s2SFaw= -github.com/DataDog/agent-payload/v5 v5.0.124/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4 h1:B34pJWfJ2kgaA30FoUoDUVDCca8hqi+kF7roUNyR8fs= -github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.4/go.mod h1:tPiFyIyrV0aneNrCY/fcyXo0GJadipU+aaIvoIWc6So= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4 h1:WzYTLPvFJ988nkONrR70ZwRGtOsqg+mmN3o21+YQd0U= -github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.4/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4 h1:MWSdTnKhrex23ogDnwZGAk2OHFg2Nnp1CHWHtVrSruc= -github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.4/go.mod h1:HgBvWpUeiM6yQWinv5lC7ERwpSJSb2dvxjnXeRHJ4r8= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4 h1:L7Cvcp7xNyGpCGvrOh09F/JcnU1hvRSAS229XuIU04o= -github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.4/go.mod h1:xTcCh6NEMd3QSsGYFFCoSwSE5Jg02OiVTD5VkP2V4hU= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4 h1:CRJ47Lr2nqci6FC0gFK06MgQDT6l0iqO3EVXIynpAVw= -github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.4/go.mod h1:roYYeTLsTH6Hd4p7virGlOUmgj37xa2CyM1fwgB0kmc= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4 h1:sPj08c37dNUHZqUf3YtYsMRSb09ff8H8cdg1ZfpEziM= -github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.4/go.mod h1:8XkiPzlYf9SGoh8rBjBW+MI2m+FOZdsuW+KQrzadJ7w= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4 h1:1PwVhlPJaK3eeRx2oItbuye9r4+Bkt4c4Rdp6vjf0rM= -github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.4/go.mod h1:e/hjXQITP8HoLdV6wbTf3mlqDTPnCJUYj2+VEHGiqeI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4 h1:P30SsL1Sy417bD6OhcmyYIooCqU3dsE9y56kZ+iZ6aI= -github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.4/go.mod h1:hFJwvCOvHGzjwGCyM3BqQ3t9TF2gDypkoYbSsbNgQs0= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4 h1:Y28aOfvmc6ces18bHBsoZOzRT6xytp4H7XmPDDsKlfA= -github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.4/go.mod h1:ir8z0B+Ab8fM66MuraFyRbNHAj8NZxPkKvuf/uhPrYs= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4 h1:BDFW8jh+tgIjZG6ItniePPlYdiOyeArWbgs5I9d3j+w= -github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.4/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4 h1:yTU8MqnX3C78veSRdcTkySwj94/9gatxRczcNzYGEqA= -github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.4/go.mod h1:1IZjuOSQ76J1oobrVtwGvuBBtHm9tpx29VZdDebSSQI= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4 h1:Vcf20HV1hVcdTnJORMBj9gi4JmNJVdqC3gFPobxHXWc= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.4/go.mod h1:eansf2vENM4gAWeOBXL+8szwQHyIxuNo9PVIygvhI54= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4 h1:m/V/ngMk3NtRvudl3912876XBc/f/z9qZutf3TTZvKA= -github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.4/go.mod h1:ifREGSm6GTGn3oB8vGgwnMHeW2/BIbiThW3URd755GM= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4 h1:MDcx5ATdVVp2unsGlRO3J9lmarFveTiT2m0QD1zpxN0= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.4/go.mod h1:IQ0aKL3gkJUW2FwIeKK/TaGrgX6T19vkDNtTyvcoHPQ= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4 h1:UXBgAgKPPMMx44yE3wecI7n9zj1gj++xQ5NhHTFmdgA= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.4/go.mod h1:MM8Vmewv4+knZUX+dr0HMbQywmu8LeIH4igS5uZrUko= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4 h1:kvCbL+lKGyNaxDxE8wvfxNCMyvJxa4VeBikm8tRJ/i4= -github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.4/go.mod h1:xhZoGJAEXEXh0NfLd5mWq1uQElC4Nr5c+9a/FWsfQ5w= +github.com/DataDog/agent-payload/v5 v5.0.125 h1:ZMlATwFarkDkr3aKyDI5UKPtZxXd9/Jsk5v28ncGx4c= +github.com/DataDog/agent-payload/v5 v5.0.125/go.mod h1:FgVQKmVdqdmZTbxIptqJC/l+xEzdiXsaAOs/vGAvWzs= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6 h1:LtB5es6u46jYOBdM8n79fClUV2o6Skn65ULSDvWlTyA= +github.com/DataDog/datadog-agent/cmd/agent/common/path v0.56.0-rc.6/go.mod h1:Sa8nnkFInG63Zpw1jN3AQoBPkLH+dNe6YJ1f8a8B2zw= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6 h1:OLwcYbBhedl3bqhboskVNfCIhNGXt9v4vZQ23ortFkA= +github.com/DataDog/datadog-agent/comp/api/api/def v0.56.0-rc.6/go.mod h1:Coyh0zcmY+SA7XBWSq/FBXrpV3obQ0AgnslbwHdhLSQ= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 h1:zVmIDZ/gTi6YEHB1xa1UEZUvROak1jR5NmEvmMaznHI= +github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6/go.mod h1:qSeL3uBTymqGA12+iZigInpIAPxhe1Tza4ULTePXPJw= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 h1:7Mw5kQDtMNIe97EJopWCwdNHOEDAIWYVbvjrwarodmQ= +github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6/go.mod h1:iLTIqAuD91w33X/4g1mbBeK0Oi3DLQOuqfuVqrLeTu8= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6 h1:AKQMFS/Nd6KKwyeu/5U7JULe3TIFP10riB/V1RJBBgk= +github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.6/go.mod h1:ncS65mbIKis7h5QYYGt/i6b1q6YSn8f46ZknRj3GeII= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 h1:bKEk3elksjR4B5OAngDK5dEIgUWfeYxBmpmlEzncQ+A= +github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6/go.mod h1:luPVd6SG2Xj0ESRoVko17VGyRlkGkhy658nPozOyCac= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 h1:HvIIXUuKpaVeBVmHkKBGB9AZamzDkMrzBSZYNpeO4Zo= +github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6/go.mod h1:K4ChYiTuODSLlfMCbfHG7UZ7XUpozprIx0/4vRNiDM4= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6 h1:qNy6hwa2pSW+BN3Fq9N/KNSzlm5GtrEVqKV7gPOhPrg= +github.com/DataDog/datadog-agent/comp/core/secrets v0.56.0-rc.6/go.mod h1:+nGjNsTO6DbqA9ihSX9wvMMFZg2mVOxDTuRoa4AH1KQ= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6 h1:y3gMhmVxlerzfeNgG9XfPY7Pw9H+EctcJsPNqIoNOUA= +github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.6/go.mod h1:SF7SHuoUAQ9xw1vmFcF3I2cUedZLyyx+jXMckkv3jbM= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6 h1:gYuKXzk6G2y8lLbWmDZv4wz5ZjBoyN8rMG1m0eT9hq0= +github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.6/go.mod h1:ts1c7j9tfa/BaoBH/gdQPt1LTeLeSh0b7IHMqm7ylDE= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 h1:UNin36Rnd/6/zXNR/qo0CTq/r2GDD+HgBFWkC1lbp7I= +github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6/go.mod h1:pG905gicJdVeoAkX5+w8Vlf5YIFPsvrNiaFZO9p9gFU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 h1:qho+fj+KNtJXaZAi6g1fQCDY42RyVHzBwbcXK6+bIEA= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6/go.mod h1:vY/zZXlsi6d45o7MTOXvRI1pCuXboQzcJ1KndkoAIfU= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 h1:2eCOKx5eGh/PSTLjD9WT7bx7j3DVihelYrPwtz1DpF4= +github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6/go.mod h1:GXACzKmOddiTT50LfNPeWy6qaXz0oFKvBia5tb/jL58= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 h1:tNhdyg874ZZtimgx7mX5dgj7pv4QoebpOlyxaaYThdo= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6/go.mod h1:lRdM0+XeOWXRMnEt7kEMaP2f7SreGZ3lTua3EShNfk4= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6 h1:9Z7tL2As/k5xVKtdc7y7udittzNMY0L5cBiqz2WvOLM= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.56.0-rc.6/go.mod h1:MXbhVcvq9gvxOjd8jSRWl1gQNnTHflqXqogfvbeXT7k= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6 h1:it53s8qoAMmPCEBFVrcVl3QKV0ElQXBAJfxUek3uC+8= +github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/statsprocessor v0.56.0-rc.6/go.mod h1:DN6AQT2QbqZbqChoRx4Hd2szkbO17zX7OxwQt5PJA3k= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d h1:wdjJ+/tBYiFLwno+lBPP66rm5jIf6ycGPRr21ogBBzE= github.com/DataDog/datadog-agent/comp/otelcol/otlp/testutil v0.57.0-devel.0.20240718200853-81bf3b2e412d/go.mod h1:CHa8CY2k0/wZkx/4KPi/WU/0m5YCfWZI1SAs1imElMA= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4 h1:36SealDqBpRc0AsbWuf0noV6Nc/1xID9MF3KV8eV+mM= -github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.4/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4 h1:4KSg9nMgxGXuf7LRYQ211KOReW2qe0Bx+p4mGZytzZI= -github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.4/go.mod h1:tkHMGP1ivmmkOc3qO5Tk8eiVet+WqpFlkYpqbRulT64= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6 h1:n/7FaY8rqSE2sePYLmu5XPYS2Usv7oKTWLKtJz2BSvE= +github.com/DataDog/datadog-agent/comp/trace/compression/def v0.56.0-rc.6/go.mod h1:siVnIBJm5EpFZe6rQ0nMz5Iy7fEl8J99Ka2QaXIYA60= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6 h1:z3R6FPPOJeCMoTpNxmTpqlZwwSCMKIrhJT/Cc0iMVW8= +github.com/DataDog/datadog-agent/comp/trace/compression/impl-gzip v0.56.0-rc.6/go.mod h1:b+ThhJiUhK3AC19XnwXgraGlKIP4rPUSCPu229PusAE= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3 h1:Hq2tQTaFcEJy9o1QFb9Ql/gm0uRzrYQkFEZGPVKLMHI= github.com/DataDog/datadog-agent/comp/trace/compression/impl-zstd v0.56.0-rc.3/go.mod h1:TOlu5v8b46+aW9h3KLZdOiwz3gJkoQerT3+F3st6ZRA= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4 h1:ThBBkW9Sgp6u0UUWZDH0p+ZHGYwrM/vZPdVEvEBFUAc= -github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.4/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4 h1:LkpNNFR3UMaWGbwVmkphw96fgGdgqvO8h9fAwABe42o= -github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.4/go.mod h1:6uwVrNNEzdL2bczKAGjNitv91b35uJENDod+eTlah88= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4 h1:nKPi1R2w461Ad70F0uSbWYMQSrudCK+ipzDPwvsMu7U= -github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.4/go.mod h1:rUYPK8Kj3NnJgkGGTFPqF6S6m2YVgD1ny9oRVBwdPr0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4 h1:rvDDMMs2lsMG4RP9BXAdhySIONaQ29msx9Qcfj3jPW0= -github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.4/go.mod h1:ocHb4Lk0C6WIdLnp6ZZcvpgdYG639hnZkfopbCLOWAo= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4 h1:to2j2pjJ7kN9LFIay7swUECLv9of+zG4azjMP4RnKRE= -github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.4/go.mod h1:2UPUGBeQzxtjAZ2UhBVGYzalE72y7/WuvaJP2wi5G+g= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4 h1:W4wwSuwCI1sQPVlEyEIkOEi17OQkuAAo00JWG3a8280= -github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.4/go.mod h1:9887F1wbPDJ4k32J/osibBm4Dx1mf79qM3bvo9+/sqo= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4 h1:96g1V6PQaA81ttboGrseIsTy/YXRuBjc/n/Od50JLLs= -github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.4/go.mod h1:RSeEw2XF+jaW2bISKBp5jRgZfAmB+iiIUuRP+1kiAcw= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4 h1:aBbAd+lnAckuAy7JlCvjRqXxMXe2gCGWhc5BlZeTBuM= -github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.4/go.mod h1:GX8x5SLGXz4d2pXlO7MLQC8Jhc2dzpH1xjX9c0OLj+s= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4 h1:ApOwzW4pyWmaadJZB1yYvOSnD0pZFoxiQTDIzb6eeqA= -github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.4/go.mod h1:+BNG3ffJgTee+rkPltaeckrzTgtJ7Bmw+Y0bGlE7abs= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4 h1:bMFx5bt7wmiNraARxHum72RPW09Yp+Q2/hF7IwKvOGU= -github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.4/go.mod h1:6fzyY2f23A8eT/OuCdde43BUYTtw5xdY8M92LlSLAtI= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4 h1:jLJBMZqFpoLq3eF36fcdjNgtTNbsLru4+4ulVz3rKiw= -github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.4/go.mod h1:Vf19YCap4AXUAKFJXNXJX8AaNaaBTiznLzT3FbNZ9aQ= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4 h1:6vYC6ib5egY3URacLettE8oQuYKUssKsjleGQSuqmFA= -github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.4/go.mod h1:W3MkNNcILOrtx2e2Fv+4VNrUOP0uqrSax39i+zW6bSE= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4 h1:WJuuko9WxaEY5/O7820MdiuOS/zfWLmCDJ5I70GzpJM= -github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.4/go.mod h1:vFbjlkJvc6f3U8IDbQDUN2IHNfOmtyidbU9ZsPwVBDM= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4 h1:6b4aTOXt0iCMUgKAvEM+EcOE2YJx9s7pRLGZk2tTUpc= -github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.4/go.mod h1:r60+SPRvjEMYWAUPEDSM9TE3CeHhQdr/RMlQVRw/tvk= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4 h1:T2cl+OaecGnc+LObbE4CdqmMBCAebH3CIbWRegYbddQ= -github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.4/go.mod h1:gPi5PQHwQpKDX+eelStx/uIorwVbxvJ4KKM2f+SA9rQ= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4 h1:RHwuqp+IMrKCYTE9Jo8wg2SgYMVzzjbucDvKQXSgCnM= -github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.4/go.mod h1:wh9D6UK6G7WFMLHMB/HYgDEJQdRgyYVH8fzRraq/QBI= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4 h1:IL0tVxPIPpkeuPYz1z3t28SfDI/oRkJaWMD5sVPyaQA= -github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.4/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4 h1:Cj/NtIX2GtgP5SYDvxF8HE6kzkvpkWbiqMDQ+0J831Y= -github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.4/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4 h1:A8sWzhqbI56Ow1aS4XjvFbMhPK/Je7Vi4WBcN6zto+Q= -github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.4/go.mod h1:xh+1p0cPMvgHG4PrmsHaagIXqynL/hwIF5Kjtx4aImA= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4 h1:ga4n85LQfEhnhz2ThipT2XOqt+6TLXOaoNiluxD/W2w= -github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.4/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4 h1:Sj8GB7554oXI7Ek6eDx9skrwWfnxzlaBzDuZCRCFSZg= -github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.4/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4 h1:GJ+ba3Ah0W+v1kh98+D6JaUfduJhDBCnlhK3wrhj9YI= -github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.4/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4 h1:zFGqASkFXZeL49KHNCu7imxFOYsIhAypRXtuOpSqtF0= -github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.4/go.mod h1:JqwmxL8i5xU/k7iKpE1LMhDxdYdL2yEUTY5IETlG+QM= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6 h1:OU1bNaISmExhvf1UCDVN9ccoVajxqOvOh2twSRgdaHw= +github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.56.0-rc.6/go.mod h1:Mpe5lBwTlmLsu1WwIx8uRbj+Bi8+9gW8rWDfXPRwQVQ= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6 h1:pb77YxVpsyT5gX2sbJqDtJQRRBOm4q7JNPWKajdg8Vk= +github.com/DataDog/datadog-agent/pkg/config/env v0.56.0-rc.6/go.mod h1:kS8TDCdO0gvl2BMRL/0XpsWR/cEnDy+HI7ZtuWPUVo8= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6 h1:eYpXZ1sn+ljObazwgUIIRcJcEjNDlYfkjrCTCYmJ/b4= +github.com/DataDog/datadog-agent/pkg/config/logs v0.56.0-rc.6/go.mod h1:fus2khOw7APls2ZgIwdqVjA7nq+YMlOsiIivruXI0BM= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6 h1:OjyXksyVjttCZWDGm6/LNX6YyxjqllnQr6oxuhhbv9Y= +github.com/DataDog/datadog-agent/pkg/config/model v0.56.0-rc.6/go.mod h1:MLm5dh6z8ZQabiJq5NKr0A/0OQMjzcYQ8KWtCy56/GQ= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6 h1:eTzuTY1hcfyPKq50UdevLF4MtFUMWh14ICsTHuM38zo= +github.com/DataDog/datadog-agent/pkg/config/setup v0.56.0-rc.6/go.mod h1:19YxHi3uNleq4GqHtzBcGwUTuwWKDq2EHjbqoEjgVBA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6 h1:i0hTL9y6kBs55ItixfSm/gW1URCZoww3sxPBwiI5sFA= +github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.6/go.mod h1:TO6lxOK2W3rYsYbXXggQxKFvyq7lBP+BKz0/wfWq/LQ= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6 h1:149QCTyg2nzYLt3bSaAVA8MlOg5mOrlrp7LMqyzSSt8= +github.com/DataDog/datadog-agent/pkg/logs/auditor v0.56.0-rc.6/go.mod h1:iKaCYetHU3IEV06SL2I0C5GvB5vF8+8v0jJuPCP5ux4= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6 h1:uYOJhYhdQeQK+wvrogjce+YefaizdIL4PiOZAeCPHDU= +github.com/DataDog/datadog-agent/pkg/logs/client v0.56.0-rc.6/go.mod h1:qo+6psfbEWHj4OoPdaoUgPXO6e+f4rS0lqSwDUJKWAY= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 h1:YZHYQIcRR3N3/mM6s/0kEle1MKl3Kh+CVH0+sTRld98= +github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6/go.mod h1:KZxnmkdM3WiECe85Vkb808UDPNDnQV5+g1ehJn/Gyic= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6 h1:uFhDhOgTC5uAvPa36CbyQ9hMpuX3Zf/PqXGq7at1FVU= +github.com/DataDog/datadog-agent/pkg/logs/message v0.56.0-rc.6/go.mod h1:gSE/BdDCYIFQMvQfyQyCDR8BfypxHZK1laqlbV/fqNI= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 h1:xqwHjzMcRvYeB6QjUYumOZzVBI6fpw4ikcBhMIQyiEU= +github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6/go.mod h1:sgzO75jq8IYXUbFzV+7XcZI5trBXNCilaqHXcZVQgMg= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 h1:OMxPtCNvW3MoEy8Nr54RjOPJF6pCN8PN0FW9fuW8Vzo= +github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6/go.mod h1:4/IgGNdC75iefcBc2LEMr9U0J/Eoj6tjFAhVmRoOfzI= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 h1:sMCW+l/t4pAlzMZklxXuVu0K84av+nL8liav116qrgc= +github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6/go.mod h1:urtlvCbtXEcuawxhFxTtcSV8dJXPfXFrBZKcdv0WF2A= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 h1:FuiSExW/kMGJXVbZ79vTML+elgvLnbf75tBx7qyFdyY= +github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6/go.mod h1:4Z/dg0+t11prtrrztedCPJ+oTK2PLpBaVMkU+8WIdPw= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 h1:ZAmq/QB3lZjTfydN860PH2frLmOoLB6YnSOspEhpCxs= +github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6/go.mod h1:ObJFyZpxENGOCL+Q/8+mZWlZxcV9wls6clr8c9JIDTY= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 h1:4fkw2/jImZdRrtG0NXhFDAj4CSpyEEyBsEQg7cIiM7c= +github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6/go.mod h1:8Dz2robkpfeJqbkZrBE1nrCaTEMfcGp8t8l2n9VexnQ= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 h1:BtsjxKQP7oH0buBJLnjPF4OHfUHow2q4LXsmqkSniI0= +github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6/go.mod h1:xsyGZLKEr6dZaJlC9QWuyYVXqMnHRwZzn641O3bfB98= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 h1:35B7SqLMMt+haFDAx2RVLtVamEmNa16mOh7k5yDFBKU= +github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6/go.mod h1:TsFFZ6y2/brcnkXLZhfp0k2xrewdyqhXnjxVpkOWIvE= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6 h1:yuShxJ13INdeYYH60M1DvZGAGBIrbqyfwX1qSD3l8yY= +github.com/DataDog/datadog-agent/pkg/logs/util/testutils v0.56.0-rc.6/go.mod h1:wQe4Ppzqh6jnmhZZjTozY06KsQ3AErT/65kstm6jHaE= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 h1:fmIyoWn7HHVOK6RCizXmJtCjmPnShRTRBgtdEnoT6PQ= +github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6/go.mod h1:/C99KWKukVnTtIiYCQ55izSNDQceREb8vSPa3zUn6jc= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 h1:yKfzVgRiwit8NTZR0iJ7d1e+7D155+VphNe5ci0v7h4= +github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6/go.mod h1:3yFk56PJ57yS1GqI9HAsS4PSlAeGCC9RQA7jxKzYj6g= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 h1:l6vgnYVtUg86zBSc4z8rMMA0z86ADfi/3/HOhsnpgQc= +github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6/go.mod h1:sNLVlyEtkYal/+kTj+mTp239DdwVuYBYOnpS90RKk5E= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6 h1:QY8IhqW9t6nXlg6HxURhFOT5GFHCpbNTyoffbDe6bbU= +github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.6/go.mod h1:rUexndyX0/drZbyDBS/ySjOZv/sdbyCy/e+i+vjME60= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f h1:qhko+fLzYmtbqHkgT/GbShyTLAmq5MFeYbknldWsPDs= github.com/DataDog/datadog-agent/pkg/trace v0.57.0-devel.0.20240716154421-697b001e760f/go.mod h1:2NvzQC8eTtIHI94ymG1UqXZanSXlL3KOiZ5oIoTAdsI= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4 h1:ENtyvawVW48h2/zKSskTqVGTb+A+28tQPFeKPl60T2g= -github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.4/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4 h1:Oto2Xy/YbirVWVP14Tc7ZNraVrTe9keuT3m1VDhe63s= -github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.4/go.mod h1:oFNxu8w44yImFD3eQyfmtaN8Dcn7k31+QnBXpE9DJkc= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4 h1:YHBcs8eeNWQqtX79xuIbJDNzcwjKShObBCNsE4Q1NNA= -github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.4/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4 h1:f/6Fv8J7o/NX+ohk36b7OeCRf6E8SeM/Ia6wrysLA/Q= -github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.4/go.mod h1:b31C70BF+erIi8UAhvZ5lltxr79RYlVyQSeIbQAmBZI= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4 h1:sQc3B3rAaC2sppYl+jHu9TRpKD49jOpNWt8m0NmcM5Q= -github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.4/go.mod h1:n/EeRNU8/JaU1Jbsbru6ul0sLuW0H0VimMnmDZX3cGU= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4 h1:/9A3Ef/pUlygTRVg5GpDPh86wjQxne3bndQRir/FoFY= -github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.4/go.mod h1:Yel4HfEYB15LI0G5NgO9n35v5F8GfrP/6V+kuZGOvXg= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4 h1:bRL2CFOXVSMz8X2799naoFeyovXlD0jqazEd/eybrzQ= -github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.4/go.mod h1:af4ZmImSYQtNfoRamUTYOMo5NsOiRNdMxE+Ng7ldits= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4 h1:BviquFfVz0JY8Ou8Ra84duhgd4XFpiHdmeZb3E2OHkw= -github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.4/go.mod h1:r+M7l7K5GkvznIdLLxh6edDSgrS5Ncwuvh8UP6FfMZ4= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4 h1:r7meov0lv45F2Ct30sRizZGWYqUX6TqaVFPl7AEdSKw= -github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.4/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4 h1:LdCGAX+GFA5iy2Jl+3+tdBYwaQCDYa+fJ9bq0djtxQ8= -github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.4/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4 h1:4HAlPx6EWkgb/NcbQZXD8YP61hlFk3Mpy+a8ihw7VS0= -github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.4/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4 h1:2xa1Fvm3/kzCz64tklaJx5JUlgZMnSLvFzJwDRhiCBU= -github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.4/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4 h1:liTie/WZnLsizRFZ4/pS1LGzPKA+67iA2b33v9JEN5o= -github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.4/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4 h1:MI50jVYeoXbrjGaCvVg51HFKVpMp7/9+T7p6qsVQ9lw= -github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.4/go.mod h1:LjVkZvONaQdyIXZ/w1NoJ2XjGK8Hd+a5lAQpfE893Hk= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4 h1:eenwM6MlHyQ6LGveUgwR1R2g0deUuznNG9Ggiwf4+OE= -github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.4/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4 h1:evbwHpEUAcvYXknhzvDwzzFhCMIjMo3peZaCsscJu0s= -github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.4/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4 h1:nD3BpXisIP+2ymcvXs7nObfxNvp5GZpEQYc3Uj2i1L4= -github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.4/go.mod h1:8Nj/lUHSxAVz/Sc5n0tnHXgWEOmwPRHuMl7QElaYibI= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4 h1:9v0R6W1bsj9PU2WcYOh155MiRxw8ec3ELEVl/ze3DmU= -github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.4/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6 h1:nAQ0IxRzcz/wSMIAf6JkjWaPZ8e1PIHCrHNrE9sRNM4= +github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.6/go.mod h1:HcSwqoxWLfevi1vuDZuFeRHfSuHGakTN6/u42WbxQHE= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6 h1:686C9eoF82jeKmFqOpgAzHinbWkm24xSeUPV3IpHQF0= +github.com/DataDog/datadog-agent/pkg/util/cgroups v0.56.0-rc.6/go.mod h1:ENrY8lv3RBn9dBXtYu9rVApfnUDvPpdk4Wkkm+jXBJY= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6 h1:wKBXTEBgNueKU77Zi8gGK78gMBU2eNV+tkWGJfq8sTU= +github.com/DataDog/datadog-agent/pkg/util/executable v0.56.0-rc.6/go.mod h1:hUJvBzOKfasYzSvlar10ZkrB8I1CR8PhtyGxmlMv/cU= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6 h1:PgqDXJ5MH/QgZdav3ceaqgQJluwrH/t/fuv9wCDt3PI= +github.com/DataDog/datadog-agent/pkg/util/filesystem v0.56.0-rc.6/go.mod h1:iWuaAayud9iJBlnfQqBEmQyQs4mbjeSWvZ9tr3YXDDc= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6 h1:/0VRtMBRwVr/ogt7Tamb5oQ3XCumTl5lOdlk5Uc6KBM= +github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.6/go.mod h1:z1j32phXt8lVa0n5kQaFi8P2mtjDhQmSZcNBn5Pf/9w= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6 h1:CyWPUqh+uYao32xV1mG5l1osnUZEbe8ejTHDn4Bs860= +github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.56.0-rc.6/go.mod h1:dtwg8dtia1iqhoftFD24ZWayKOdHdDZWymA0BTcyLvE= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6 h1:EyjE4yiZHfnXgicYnfiqTNOaFfeCwNiH3jV/GUq/es4= +github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.6/go.mod h1:LAIr/bbTppGIAjy7EZXUU5pxu7e3If83OO+8SKKQx3U= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6 h1:rwnbc2e/DLw56CKgzs/Ibqer5ShjA1V8olnmekcmC+Y= +github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.6/go.mod h1:Hiyb6L8eoZjCZgHTDOzoXTo0NqgHH5gX0EcomHr7QiA= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6 h1:6kBc7L0BZ11htsNyclCJaN5IUi0EHPbauki3/wdXPwU= +github.com/DataDog/datadog-agent/pkg/util/optional v0.56.0-rc.6/go.mod h1:wa1JIWnzo9EvOBwzDOeff8HeqgOq9JQANRb99/nKg3A= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6 h1:POsiTWzdyV9gkTFAK3pGBIwRwGAAdGIqv2u76zafQY4= +github.com/DataDog/datadog-agent/pkg/util/pointer v0.56.0-rc.6/go.mod h1:ahpEhdpkifOLy0/XLHas+SseEmMQnwMgV1CMVkSuXL0= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6 h1:/mXOc644CYBtA2Ck3oJNF7VfYbjOfAzKhtSLd2tFu3U= +github.com/DataDog/datadog-agent/pkg/util/scrubber v0.56.0-rc.6/go.mod h1:8ASCNWHQtcmUedxL+WjbCPSIcGIM8LeVzil7JCzx0js= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6 h1:lljXGdvEEOVxUAiltMI2i1hPj7cOlUQm/Sl5Ofw9ZHo= +github.com/DataDog/datadog-agent/pkg/util/startstop v0.56.0-rc.6/go.mod h1:F9ysDtw4BnbZIuKdwOdiHranjG9QMv2o7PMVreIhFzI= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6 h1:yVRtV3MChW9ZrcMn+xcgzJ0r/CMJ2MfoZgwK+cy7OA4= +github.com/DataDog/datadog-agent/pkg/util/statstracker v0.56.0-rc.6/go.mod h1:KkiJi2f4mcxAJA00ArYw4zTfs0oWMU1bNXqKhymRVZg= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6 h1:WbLpNspSnYFbtYUKtevdiawt9/nvEahdrmqroYuzaos= +github.com/DataDog/datadog-agent/pkg/util/system v0.56.0-rc.6/go.mod h1:6YNUIA0LejPEjdlbHwMfY2vKTYfR2IjA5EaOk0bUWow= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6 h1:fIjm7+gXZCFxKNQQDQUXsFL5lXR3VAsvCiyLugomNOw= +github.com/DataDog/datadog-agent/pkg/util/system/socket v0.56.0-rc.6/go.mod h1:RKqan/bns7z9tqZBWSkshY1e6VisZJaU0b/XQcIDyAQ= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6 h1:EeA2wDREGCbeIk6UFyLZ/jdFm6itmDisiwrbHvIFMIY= +github.com/DataDog/datadog-agent/pkg/util/testutil v0.56.0-rc.6/go.mod h1:YAy9qytR6UBs3U97YIySGvFEOP69OSHVQFCzKJLJWk0= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6 h1:spJRfOwJrCeJXWEzFvjZD+Vvsr1q/jiaxpIIchqTlfs= +github.com/DataDog/datadog-agent/pkg/util/winutil v0.56.0-rc.6/go.mod h1:KsUItPqRj8C6oHipUNr0Q/bUzwaeQ4SVeQ58uK6HsT4= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 h1:RqOa8G/MlCoH4Joxumu5JXVqNXl1+l2hHm9VluBbt7w= +github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index ad271f9e3117..2413317474c0 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datado go 1.21.0 require ( - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.105.0 github.com/stretchr/testify v1.9.0 diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index c4fe2127e7ce..ebd32f488bcc 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -1,7 +1,7 @@ -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/testbed/go.mod b/testbed/go.mod index e71391441eee..3cb7e3a9b60b 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -79,9 +79,9 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect github.com/Code-Hex/go-generics-cache v1.5.1 // indirect - github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 // indirect + github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 // indirect - github.com/DataDog/datadog-api-client-go/v2 v2.27.0 // indirect + github.com/DataDog/datadog-api-client-go/v2 v2.28.0 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index dfa220383e92..b316190de588 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -59,15 +59,15 @@ 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/Code-Hex/go-generics-cache v1.5.1 h1:6vhZGc5M7Y/YD8cIUcY8kcuQLB4cHR7U+0KMqAA0KcU= github.com/Code-Hex/go-generics-cache v1.5.1/go.mod h1:qxcC9kRVrct9rHeiYpFWSoW1vxyillCVzX13KZG8dl4= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4 h1:nOSyRWX5tkxkGm0n9F7ZZP3Mw3VozNcBZJgeBj7leTY= -github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.4/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 h1:KyUOJ/0bJPAFzp/r/7OK41v7JQqTLMTeCq9FkYteoiI= +github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6/go.mod h1:gHkSUTn6H6UEZQHY3XWBIGNjfI3Tdi0IxlrxIFBWDwU= 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= github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009092105-58e18918b2db/go.mod h1:cRy7lwapA3jcjnX74kU6NFkXaRGQyB0l/QZA0IwYGEQ= github.com/DataDog/datadog-agent/pkg/util/winutil v0.0.0-20201009092105-58e18918b2db/go.mod h1:EtS4X73GXAyrpVddkLQ4SewSQX+zv284e8iIkVBXgtk= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= -github.com/DataDog/datadog-api-client-go/v2 v2.27.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= +github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go v3.5.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= From c71919f3aa6d3b9b820d357b919839b46f984599 Mon Sep 17 00:00:00 2001 From: Bomin Rahmani <38274348+BominRahmani@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:08:25 -0400 Subject: [PATCH 04/30] [chore][receiver/vcenter] Reworked Integration test for vCenter (#34201) **Description:** The following PR works to make the integration tests a bit more deterministic by taking advantage of the govmomi simulator. Previously the integration test had the following line when comparing ``` pmetrictest.IgnoreResourceAttributeValue("vcenter.host.name") ``` Which is a bit of a hacky fix that addressed an issue where the simulator had inconsistent VM to Host assignments between test runs. Although ignoring the resource attribute value currently works, it breaks once datacenter metrics are enabled by default This PR hopes to make the integration tests more consistent and accurate going forward. **Link to tracking Issue:** **Testing:** - Regenerated the expected.yaml using `scraperinttest.WriteExpected()` - Passes Integration test **Documentation:** --- receiver/vcenterreceiver/integration_test.go | 52 +- .../testdata/integration/expected.yaml | 874 +++++++++--------- 2 files changed, 486 insertions(+), 440 deletions(-) diff --git a/receiver/vcenterreceiver/integration_test.go b/receiver/vcenterreceiver/integration_test.go index 44b4433ad843..7ab2fa40c958 100644 --- a/receiver/vcenterreceiver/integration_test.go +++ b/receiver/vcenterreceiver/integration_test.go @@ -17,6 +17,7 @@ import ( "github.com/vmware/govmomi/session" "github.com/vmware/govmomi/simulator" "github.com/vmware/govmomi/vim25" + "github.com/vmware/govmomi/vim25/types" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configopaque" "go.opentelemetry.io/collector/config/configtls" @@ -26,7 +27,52 @@ import ( ) func TestIntegration(t *testing.T) { - simulator.Test(func(_ context.Context, c *vim25.Client) { + model := simulator.VPX() + + model.Host = 2 + model.Machine = 2 + + err := model.Create() + require.NoError(t, err) + + simulator.Test(func(ctx context.Context, c *vim25.Client) { + finder := find.NewFinder(c) + + hosts, err := finder.HostSystemList(ctx, "/DC0/host/*") + require.NoError(t, err) + for i, host := range hosts { + newName := fmt.Sprintf("H%d", i) + simulator.Map.Get(host.Reference()).(*simulator.HostSystem).Name = newName + } + + vms, err := finder.VirtualMachineList(ctx, "/DC0/vm/*") + require.NoError(t, err) + for i, vm := range vms { + newName := fmt.Sprintf("VM%d", i) + newUUID := fmt.Sprintf("vm-uuid-%d", i) + simVM := simulator.Map.Get(vm.Reference()).(*simulator.VirtualMachine) + simVM.Name = newName + simVM.Config.Uuid = newUUID + + // Explicitly assign VM to a specific host + hostIndex := i % len(hosts) // This will alternate VMs between hosts + host := hosts[hostIndex] + hostRef := host.Reference() + relocateSpec := types.VirtualMachineRelocateSpec{ + Host: &hostRef, + } + task, err := vm.Relocate(ctx, relocateSpec, types.VirtualMachineMovePriorityDefaultPriority) + require.NoError(t, err) + require.NoError(t, task.Wait(ctx)) + + // Reconfigure the VM to apply name and UUID changes + task, err = vm.Reconfigure(ctx, types.VirtualMachineConfigSpec{ + Name: newName, + Uuid: newUUID, + }) + require.NoError(t, err) + require.NoError(t, task.Wait(ctx)) + } pw, set := simulator.DefaultLogin.Password() require.True(t, set) @@ -51,7 +97,6 @@ func TestIntegration(t *testing.T) { defer func() { newVcenterClient = defaultNewVcenterClient }() - scraperinttest.NewIntegrationTest( NewFactory(), scraperinttest.WithCustomConfig( @@ -66,9 +111,10 @@ func TestIntegration(t *testing.T) { } }), scraperinttest.WithCompareOptions( - pmetrictest.IgnoreResourceAttributeValue("vcenter.host.name"), pmetrictest.IgnoreTimestamp(), pmetrictest.IgnoreResourceMetricsOrder(), + pmetrictest.IgnoreDatapointAttributesOrder(), + pmetrictest.IgnoreMetricDataPointsOrder(), pmetrictest.IgnoreMetricsOrder(), pmetrictest.IgnoreStartTimestamp(), pmetrictest.IgnoreMetricValues(), diff --git a/receiver/vcenterreceiver/testdata/integration/expected.yaml b/receiver/vcenterreceiver/testdata/integration/expected.yaml index e2ae90b2adeb..9c40f5b381ae 100644 --- a/receiver/vcenterreceiver/testdata/integration/expected.yaml +++ b/receiver/vcenterreceiver/testdata/integration/expected.yaml @@ -1,131 +1,106 @@ resourceMetrics: - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - - key: vcenter.host.name - value: - stringValue: DC0_H0 - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_H0/Resources scopeMetrics: - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares + - description: The effective CPU available to the cluster. This value excludes CPU from hosts in maintenance mode or are unresponsive. + name: vcenter.cluster.cpu.effective sum: aggregationTemporality: 2 dataPoints: - - asInt: "9000" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{shares}" - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares + - asInt: "6882" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{MHz}' + - description: The amount of CPU available to the cluster. + name: vcenter.cluster.cpu.limit sum: aggregationTemporality: 2 dataPoints: - - asInt: "9000" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{shares}" - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.datacenter.name - value: - stringValue: DC0 - - key: vcenter.cluster.name - value: - stringValue: DC0_C0 - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_C0/Resources - scopeMetrics: - - metrics: - - description: The amount of shares of CPU in the resource pool. - name: vcenter.resource_pool.cpu.shares + - asInt: "6882" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{MHz}' + - description: The number of hosts in the cluster. + name: vcenter.cluster.host.count sum: aggregationTemporality: 2 dataPoints: - - asInt: "9000" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{shares}" - - description: The amount of shares of memory in the resource pool. - name: vcenter.resource_pool.memory.shares + - asInt: "0" + attributes: + - key: effective + value: + boolValue: false + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "3" + attributes: + - key: effective + value: + boolValue: true + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{hosts}' + - description: The effective available memory of the cluster. + name: vcenter.cluster.memory.effective sum: aggregationTemporality: 2 dataPoints: - - asInt: "9000" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{shares}" - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.datacenter.name - value: - stringValue: DC0 - - key: vcenter.host.name - value: - stringValue: DC0_H0 - scopeMetrics: - - metrics: - - description: Total CPU capacity of the host system. - name: vcenter.host.cpu.capacity + - asInt: "13509110959964160" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The available memory of the cluster. + name: vcenter.cluster.memory.limit sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MHz - - description: The amount of CPU used by the host. - name: vcenter.host.cpu.usage + - asInt: "12883292160" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of virtual machines in the cluster. + name: vcenter.cluster.vm.count sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MHz - - description: The CPU utilization of the host system. - gauge: - dataPoints: - - asDouble: 1.4603312990409765 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - name: vcenter.host.cpu.utilization - unit: "%" - - description: The amount of memory the host system is using. - name: vcenter.host.memory.usage + - asInt: "0" + attributes: + - key: power_state + value: + stringValue: "off" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "2" + attributes: + - key: power_state + value: + stringValue: "on" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: power_state + value: + stringValue: suspended + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{virtual_machines}' + - description: The number of virtual machine templates in the cluster. + name: vcenter.cluster.vm_template.count sum: aggregationTemporality: 2 dataPoints: - - asInt: "1404" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy - - description: The percentage of the host system's memory capacity that is being utilized. - gauge: - dataPoints: - - asDouble: 34.285714285714285 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - name: vcenter.host.memory.utilization - unit: "%" + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{virtual_machine_templates}' scope: name: otelcol/vcenterreceiver version: latest @@ -144,29 +119,29 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "42949672960" + - asInt: "10952166604800" attributes: - key: disk_state value: - stringValue: used - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "10952166604800" + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "42949672960" attributes: - key: disk_state value: - stringValue: available - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of the datastore. gauge: dataPoints: - asDouble: 0.390625 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.datastore.disk.utilization - unit: "%" + unit: '%' scope: name: otelcol/vcenterreceiver version: latest @@ -175,190 +150,68 @@ resourceMetrics: - key: vcenter.datacenter.name value: stringValue: DC0 - - key: vcenter.vm.name - value: - stringValue: DC0_H0_VM0 - - key: vcenter.vm.id - value: - stringValue: b4689bed-97f0-5bcd-8a4c-07477cc8f06f - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_H0/Resources - key: vcenter.host.name value: - stringValue: DC0_H0 + stringValue: H0 scopeMetrics: - metrics: - - description: The amount of storage space used by the virtual machine. - name: vcenter.vm.disk.usage - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "10737418240" - attributes: - - key: disk_state - value: - stringValue: available - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: By - - description: The utilization of storage on the virtual machine. - gauge: - dataPoints: - - asDouble: 0 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - name: vcenter.vm.disk.utilization - unit: "%" - - description: The amount of memory that is ballooned due to virtualization. - name: vcenter.vm.memory.ballooned - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy - - description: The portion of memory that is granted to this VM from the host's swap space. - name: vcenter.vm.memory.swapped - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy - - description: The amount of memory swapped to fast disk device such as SSD. - name: vcenter.vm.memory.swapped_ssd - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: KiBy - - description: The amount of memory that is used by the virtual machine. - name: vcenter.vm.memory.usage + - description: Total CPU capacity of the host system. + name: vcenter.host.cpu.capacity sum: aggregationTemporality: 2 dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy - scope: - name: otelcol/vcenterreceiver - version: latest - - resource: - attributes: - - key: vcenter.datacenter.name - value: - stringValue: DC0 - - key: vcenter.vm.name - value: - stringValue: DC0_H0_VM1 - - key: vcenter.vm.id - value: - stringValue: 12f8928d-f144-5c57-89db-dd2d0902c9fa - - key: vcenter.resource_pool.name - value: - stringValue: Resources - - key: vcenter.resource_pool.inventory_path - value: - stringValue: /DC0/host/DC0_H0/Resources - - key: vcenter.host.name - value: - stringValue: DC0_H0 - scopeMetrics: - - metrics: - - description: The amount of storage space used by the virtual machine. - name: vcenter.vm.disk.usage + - asInt: "4588" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MHz + - description: The amount of CPU used by the host. + name: vcenter.host.cpu.usage sum: aggregationTemporality: 2 dataPoints: - - asInt: "0" - attributes: - - key: disk_state - value: - stringValue: used - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "10737418240" - attributes: - - key: disk_state - value: - stringValue: available - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: By - - description: The utilization of storage on the virtual machine. + - asInt: "67" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MHz + - description: The CPU utilization of the host system. gauge: dataPoints: - - asDouble: 0 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - name: vcenter.vm.disk.utilization - unit: "%" - - description: The amount of memory that is ballooned due to virtualization. - name: vcenter.vm.memory.ballooned - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy - - description: The portion of memory that is granted to this VM from the host's swap space. - name: vcenter.vm.memory.swapped + - asDouble: 1.4603312990409765 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: vcenter.host.cpu.utilization + unit: '%' + - description: The amount of memory the host system is using. + name: vcenter.host.memory.usage sum: aggregationTemporality: 2 dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + - asInt: "1404" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - - description: The amount of memory swapped to fast disk device such as SSD. - name: vcenter.vm.memory.swapped_ssd - sum: - aggregationTemporality: 2 - dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: KiBy - - description: The amount of memory that is used by the virtual machine. - name: vcenter.vm.memory.usage - sum: - aggregationTemporality: 2 + - description: The percentage of the host system's memory capacity that is being utilized. + gauge: dataPoints: - - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: MiBy + - asDouble: 34.285714285714285 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: vcenter.host.memory.utilization + unit: '%' scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - key: vcenter.host.name value: - stringValue: DC0_C0_H0 - - key: vcenter.cluster.name - value: - stringValue: DC0_C0 + stringValue: H1 scopeMetrics: - metrics: - description: Total CPU capacity of the host system. @@ -366,9 +219,9 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + - asInt: "4588" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The amount of CPU used by the host. name: vcenter.host.cpu.usage @@ -376,48 +229,48 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 1.4603312990409765 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.cpu.utilization - unit: "%" + unit: '%' - description: The amount of memory the host system is using. name: vcenter.host.memory.usage sum: aggregationTemporality: 2 dataPoints: - asInt: "1404" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The percentage of the host system's memory capacity that is being utilized. gauge: dataPoints: - asDouble: 34.285714285714285 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.memory.utilization - unit: "%" + unit: '%' scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - key: vcenter.host.name value: - stringValue: DC0_C0_H1 - - key: vcenter.cluster.name - value: - stringValue: DC0_C0 + stringValue: H2 scopeMetrics: - metrics: - description: Total CPU capacity of the host system. @@ -425,9 +278,9 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + - asInt: "4588" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The amount of CPU used by the host. name: vcenter.host.cpu.usage @@ -435,48 +288,48 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 1.4603312990409765 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.cpu.utilization - unit: "%" + unit: '%' - description: The amount of memory the host system is using. name: vcenter.host.memory.usage sum: aggregationTemporality: 2 dataPoints: - asInt: "1404" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The percentage of the host system's memory capacity that is being utilized. gauge: dataPoints: - asDouble: 34.285714285714285 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.memory.utilization - unit: "%" + unit: '%' scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - key: vcenter.host.name value: - stringValue: DC0_C0_H2 - - key: vcenter.cluster.name - value: - stringValue: DC0_C0 + stringValue: H3 scopeMetrics: - metrics: - description: Total CPU capacity of the host system. @@ -484,9 +337,9 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + - asInt: "4588" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The amount of CPU used by the host. name: vcenter.host.cpu.usage @@ -494,60 +347,131 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "67" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MHz - description: The CPU utilization of the host system. gauge: dataPoints: - asDouble: 1.4603312990409765 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.cpu.utilization - unit: "%" + unit: '%' - description: The amount of memory the host system is using. name: vcenter.host.memory.usage sum: aggregationTemporality: 2 dataPoints: - asInt: "1404" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The percentage of the host system's memory capacity that is being utilized. gauge: dataPoints: - asDouble: 34.285714285714285 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.host.memory.utilization - unit: "%" + unit: '%' scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - - key: vcenter.vm.name + - key: vcenter.resource_pool.inventory_path value: - stringValue: DC0_C0_RP0_VM0 - - key: vcenter.vm.id + stringValue: /DC0/host/DC0_C0/Resources + - key: vcenter.resource_pool.name value: - stringValue: bfff331f-7f07-572d-951e-edd3701dc061 - - key: vcenter.cluster.name + stringValue: Resources + scopeMetrics: + - metrics: + - description: The amount of shares of CPU in the resource pool. + name: vcenter.resource_pool.cpu.shares + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "9000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{shares}' + - description: The amount of shares of memory in the resource pool. + name: vcenter.resource_pool.memory.shares + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "9000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{shares}' + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.datacenter.name value: - stringValue: DC0_C0 + stringValue: DC0 + - key: vcenter.host.name + value: + stringValue: H0 + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_H0/Resources - key: vcenter.resource_pool.name value: stringValue: Resources - - key: vcenter.resource_pool.inventory_path + scopeMetrics: + - metrics: + - description: The amount of shares of CPU in the resource pool. + name: vcenter.resource_pool.cpu.shares + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "9000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{shares}' + - description: The amount of shares of memory in the resource pool. + name: vcenter.resource_pool.memory.shares + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "9000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{shares}' + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.datacenter.name value: - stringValue: /DC0/host/DC0_C0/Resources + stringValue: DC0 - key: vcenter.host.name value: - stringValue: DC0_C0_H0 + stringValue: H0 + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_H0/Resources + - key: vcenter.resource_pool.name + value: + stringValue: Resources + - key: vcenter.vm.id + value: + stringValue: b4689bed-97f0-5bcd-8a4c-07477cc8f06f + - key: vcenter.vm.name + value: + stringValue: VM0 scopeMetrics: - metrics: - description: The amount of storage space used by the virtual machine. @@ -555,37 +479,37 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "0" + - asInt: "10737418240" attributes: - key: disk_state value: - stringValue: used - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "10737418240" + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" attributes: - key: disk_state value: - stringValue: available - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.disk.utilization - unit: "%" + unit: '%' - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -593,8 +517,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -602,8 +526,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -611,8 +535,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy scope: name: otelcol/vcenterreceiver @@ -622,24 +546,21 @@ resourceMetrics: - key: vcenter.datacenter.name value: stringValue: DC0 - - key: vcenter.vm.name - value: - stringValue: DC0_C0_RP0_VM1 - - key: vcenter.vm.id + - key: vcenter.host.name value: - stringValue: 6132d223-1566-5921-bc3b-df91ece09a4d - - key: vcenter.cluster.name + stringValue: H1 + - key: vcenter.resource_pool.inventory_path value: - stringValue: DC0_C0 + stringValue: /DC0/host/DC0_H0/Resources - key: vcenter.resource_pool.name value: stringValue: Resources - - key: vcenter.resource_pool.inventory_path + - key: vcenter.vm.id value: - stringValue: /DC0/host/DC0_C0/Resources - - key: vcenter.host.name + stringValue: 12f8928d-f144-5c57-89db-dd2d0902c9fa + - key: vcenter.vm.name value: - stringValue: DC0_C0_H2 + stringValue: VM1 scopeMetrics: - metrics: - description: The amount of storage space used by the virtual machine. @@ -647,37 +568,37 @@ resourceMetrics: sum: aggregationTemporality: 2 dataPoints: - - asInt: "0" + - asInt: "10737418240" attributes: - key: disk_state value: - stringValue: used - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "10737418240" + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" attributes: - key: disk_state value: - stringValue: available - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: By - description: The utilization of storage on the virtual machine. gauge: dataPoints: - asDouble: 0 - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" name: vcenter.vm.disk.utilization - unit: "%" + unit: '%' - description: The amount of memory that is ballooned due to virtualization. name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The portion of memory that is granted to this VM from the host's swap space. name: vcenter.vm.memory.swapped @@ -685,8 +606,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy - description: The amount of memory swapped to fast disk device such as SSD. name: vcenter.vm.memory.swapped_ssd @@ -694,8 +615,8 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: KiBy - description: The amount of memory that is used by the virtual machine. name: vcenter.vm.memory.usage @@ -703,114 +624,193 @@ resourceMetrics: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" unit: MiBy scope: name: otelcol/vcenterreceiver version: latest - resource: attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 - key: vcenter.datacenter.name value: stringValue: DC0 - - key: vcenter.cluster.name + - key: vcenter.host.name value: - stringValue: DC0_C0 + stringValue: H2 + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_C0/Resources + - key: vcenter.resource_pool.name + value: + stringValue: Resources + - key: vcenter.vm.id + value: + stringValue: bfff331f-7f07-572d-951e-edd3701dc061 + - key: vcenter.vm.name + value: + stringValue: VM2 scopeMetrics: - metrics: - - description: The effective CPU available to the cluster. This value excludes CPU from hosts in maintenance mode or are unresponsive. - name: vcenter.cluster.cpu.effective + - description: The amount of storage space used by the virtual machine. + name: vcenter.vm.disk.usage sum: aggregationTemporality: 2 dataPoints: - - asInt: "6882" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{MHz}" - - description: The amount of CPU available to the cluster. - name: vcenter.cluster.cpu.limit + - asInt: "10737418240" + attributes: + - key: disk_state + value: + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: disk_state + value: + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The utilization of storage on the virtual machine. + gauge: + dataPoints: + - asDouble: 0 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: vcenter.vm.disk.utilization + unit: '%' + - description: The amount of memory that is ballooned due to virtualization. + name: vcenter.vm.memory.ballooned sum: aggregationTemporality: 2 dataPoints: - - asInt: "6882" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{MHz}" - - description: The number of hosts in the cluster. - name: vcenter.cluster.host.count + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The portion of memory that is granted to this VM from the host's swap space. + name: vcenter.vm.memory.swapped sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - attributes: - - key: effective - value: - boolValue: false - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - - asInt: "3" - attributes: - - key: effective - value: - boolValue: true - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{hosts}" - - description: The effective available memory of the cluster. - name: vcenter.cluster.memory.effective + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The amount of memory swapped to fast disk device such as SSD. + name: vcenter.vm.memory.swapped_ssd sum: aggregationTemporality: 2 dataPoints: - - asInt: "13500061378877440" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: By - - description: The available memory of the cluster. - name: vcenter.cluster.memory.limit + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: KiBy + - description: The amount of memory that is used by the virtual machine. + name: vcenter.vm.memory.usage sum: aggregationTemporality: 2 dataPoints: - - asInt: "12883292160" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: By - - description: The number of virtual machines in the cluster. - name: vcenter.cluster.vm.count + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + scope: + name: otelcol/vcenterreceiver + version: latest + - resource: + attributes: + - key: vcenter.cluster.name + value: + stringValue: DC0_C0 + - key: vcenter.datacenter.name + value: + stringValue: DC0 + - key: vcenter.host.name + value: + stringValue: H3 + - key: vcenter.resource_pool.inventory_path + value: + stringValue: /DC0/host/DC0_C0/Resources + - key: vcenter.resource_pool.name + value: + stringValue: Resources + - key: vcenter.vm.id + value: + stringValue: 6132d223-1566-5921-bc3b-df91ece09a4d + - key: vcenter.vm.name + value: + stringValue: VM3 + scopeMetrics: + - metrics: + - description: The amount of storage space used by the virtual machine. + name: vcenter.vm.disk.usage sum: aggregationTemporality: 2 dataPoints: - - asInt: "2" + - asInt: "10737418240" attributes: - - key: power_state + - key: disk_state value: - stringValue: "on" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" - asInt: "0" attributes: - - key: power_state + - key: disk_state value: - stringValue: "off" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The utilization of storage on the virtual machine. + gauge: + dataPoints: + - asDouble: 0 + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + name: vcenter.vm.disk.utilization + unit: '%' + - description: The amount of memory that is ballooned due to virtualization. + name: vcenter.vm.memory.ballooned + sum: + aggregationTemporality: 2 + dataPoints: - asInt: "0" - attributes: - - key: power_state - value: - stringValue: "suspended" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{virtual_machines}" - - description: The number of virtual machine templates in the cluster. - name: vcenter.cluster.vm_template.count + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The portion of memory that is granted to this VM from the host's swap space. + name: vcenter.vm.memory.swapped + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The amount of memory swapped to fast disk device such as SSD. + name: vcenter.vm.memory.swapped_ssd sum: aggregationTemporality: 2 dataPoints: - asInt: "0" - startTimeUnixNano: "1707407684042820000" - timeUnixNano: "1707407733803628000" - unit: "{virtual_machine_templates}" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: KiBy + - description: The amount of memory that is used by the virtual machine. + name: vcenter.vm.memory.usage + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy scope: name: otelcol/vcenterreceiver version: latest From 6a4d7cd8104790b9e0b4f4cf32a3fa8aba63d8f0 Mon Sep 17 00:00:00 2001 From: "Chris M." Date: Tue, 23 Jul 2024 16:18:31 +0300 Subject: [PATCH 05/30] [chore] [pkg/stanza] Mock time functions for flaky TestExcludeOlderThanFilter (#34174) **Description:** Similar to https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34128. Mocking the time functions to fix flakiness on windows. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32838 **Testing:** **Documentation:** Signed-off-by: ChrsMark --- cmd/otelcontribcol/go.mod | 1 + cmd/oteltestbedcol/go.mod | 1 + connector/datadogconnector/go.sum | 2 ++ exporter/datadogexporter/go.mod | 1 + .../datadogexporter/integrationtest/go.sum | 2 ++ .../internal/reader/reader_test.go | 23 ++---------- .../matcher/internal/filter/exclude.go | 4 ++- .../matcher/internal/filter/exclude_test.go | 16 +++------ pkg/stanza/flush/flush.go | 10 +++--- pkg/stanza/internal/now/now.go | 8 ----- pkg/stanza/internal/time/time.go | 35 +++++++++++++++++++ receiver/filelogreceiver/go.mod | 1 + receiver/otlpjsonfilereceiver/go.mod | 1 + 13 files changed, 59 insertions(+), 46 deletions(-) delete mode 100644 pkg/stanza/internal/now/now.go create mode 100644 pkg/stanza/internal/time/time.go diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index c2284e11d2e2..59641d1d580e 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -562,6 +562,7 @@ require ( github.com/jcmturner/rpc/v2 v2.0.3 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 1166b6f0b492..b48ba55896af 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -150,6 +150,7 @@ require ( github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect github.com/jaegertracing/jaeger v1.59.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index cf16dc6b5ce4..1b25e5701c77 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -573,6 +573,8 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index d74c988b70e7..21e6dac994b6 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -222,6 +222,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 9641a25b6630..7e4978036fd6 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -573,6 +573,8 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= diff --git a/pkg/stanza/fileconsumer/internal/reader/reader_test.go b/pkg/stanza/fileconsumer/internal/reader/reader_test.go index 521aab3bf9d6..5f07b23821ee 100644 --- a/pkg/stanza/fileconsumer/internal/reader/reader_test.go +++ b/pkg/stanza/fileconsumer/internal/reader/reader_test.go @@ -10,13 +10,12 @@ import ( "testing" "time" - "github.com/jonboulle/clockwork" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/filetest" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/now" + internaltime "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/time" ) func TestFileReader_FingerprintUpdated(t *testing.T) { @@ -207,25 +206,9 @@ func TestFlushPeriodEOF(t *testing.T) { require.NoError(t, err) assert.Equal(t, int64(0), r.Offset) - now.Now = newAlwaysIncreasingClock().Now - defer func() { now.Now = time.Now }() + internaltime.Now = internaltime.NewAlwaysIncreasingClock().Now + defer func() { internaltime.Now = time.Now }() r.ReadToEnd(context.Background()) sink.ExpectTokens(t, content[0:aContentLength], []byte{'b'}) } - -// Clock where Now() always returns a greater value than the previous return value -type alwaysIncreasingClock struct { - clockwork.FakeClock -} - -func newAlwaysIncreasingClock() alwaysIncreasingClock { - return alwaysIncreasingClock{ - FakeClock: clockwork.NewFakeClock(), - } -} - -func (c alwaysIncreasingClock) Now() time.Time { - c.FakeClock.Advance(time.Nanosecond) - return c.FakeClock.Now() -} diff --git a/pkg/stanza/fileconsumer/matcher/internal/filter/exclude.go b/pkg/stanza/fileconsumer/matcher/internal/filter/exclude.go index 8e6e254f597e..de4156535cfe 100644 --- a/pkg/stanza/fileconsumer/matcher/internal/filter/exclude.go +++ b/pkg/stanza/fileconsumer/matcher/internal/filter/exclude.go @@ -7,6 +7,8 @@ import ( "time" "go.uber.org/multierr" + + internaltime "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/time" ) type excludeOlderThanOption struct { @@ -25,7 +27,7 @@ func (eot excludeOlderThanOption) apply(items []*item) ([]*item, error) { // Keep (include) the file if its age (since last modification) // is the same or less than the configured age. - fileAge := time.Since(fi.ModTime()) + fileAge := internaltime.Since(fi.ModTime()) if fileAge <= eot.age { filteredItems = append(filteredItems, item) } diff --git a/pkg/stanza/fileconsumer/matcher/internal/filter/exclude_test.go b/pkg/stanza/fileconsumer/matcher/internal/filter/exclude_test.go index 436bec80987d..6eb745314c91 100644 --- a/pkg/stanza/fileconsumer/matcher/internal/filter/exclude_test.go +++ b/pkg/stanza/fileconsumer/matcher/internal/filter/exclude_test.go @@ -11,6 +11,8 @@ import ( "time" "github.com/stretchr/testify/require" + + internaltime "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/time" ) func TestExcludeOlderThanFilter(t *testing.T) { @@ -25,10 +27,6 @@ func TestExcludeOlderThanFilter(t *testing.T) { expect []string expectedErr string expectedWindowsErr string - - // List of OSes on which to skip this test case - skipOS []string - skipReason string }{ "no_files": { files: []string{}, @@ -47,9 +45,6 @@ func TestExcludeOlderThanFilter(t *testing.T) { expectedErr: "", }, "exclude_some_files": { - skipOS: []string{"windows"}, - skipReason: "Flaky test case on Windows: https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32838", - files: []string{"a.log", "b.log"}, fileMTimes: []time.Time{twoHoursAgo, threeHoursAgo}, excludeOlderThan: 3 * time.Hour, @@ -78,11 +73,8 @@ func TestExcludeOlderThanFilter(t *testing.T) { for name, tc := range cases { t.Run(name, func(t *testing.T) { - for _, os := range tc.skipOS { - if runtime.GOOS == os { - t.Skipf("Skipping test case: %s", tc.skipReason) - } - } + internaltime.Since = internaltime.NewAlwaysIncreasingClock().Since + defer func() { internaltime.Since = time.Since }() tmpDir := t.TempDir() var items []*item diff --git a/pkg/stanza/flush/flush.go b/pkg/stanza/flush/flush.go index 9c3c4926e902..b4d700795898 100644 --- a/pkg/stanza/flush/flush.go +++ b/pkg/stanza/flush/flush.go @@ -7,7 +7,7 @@ import ( "bufio" "time" - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/now" + internaltime "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/time" ) type State struct { @@ -42,7 +42,7 @@ func (s *State) Func(splitFunc bufio.SplitFunc, period time.Duration) bufio.Spli // If there's a token, return it if token != nil { - s.LastDataChange = now.Now() + s.LastDataChange = internaltime.Now() s.LastDataLength = 0 return advance, token, err } @@ -55,14 +55,14 @@ func (s *State) Func(splitFunc bufio.SplitFunc, period time.Duration) bufio.Spli // We're seeing new data so postpone the next flush if len(data) > s.LastDataLength { - s.LastDataChange = now.Now() + s.LastDataChange = internaltime.Now() s.LastDataLength = len(data) return 0, nil, nil } // Flush timed out if time.Since(s.LastDataChange) > period { - s.LastDataChange = now.Now() + s.LastDataChange = internaltime.Now() s.LastDataLength = 0 return len(data), data, nil } @@ -74,6 +74,6 @@ func (s *State) Func(splitFunc bufio.SplitFunc, period time.Duration) bufio.Spli // Deprecated: [v0.88.0] Use WithFunc instead. func WithPeriod(splitFunc bufio.SplitFunc, period time.Duration) bufio.SplitFunc { - s := &State{LastDataChange: now.Now()} + s := &State{LastDataChange: internaltime.Now()} return s.Func(splitFunc, period) } diff --git a/pkg/stanza/internal/now/now.go b/pkg/stanza/internal/now/now.go deleted file mode 100644 index 17de420da57a..000000000000 --- a/pkg/stanza/internal/now/now.go +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package now // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/now" - -import "time" - -var Now = time.Now diff --git a/pkg/stanza/internal/time/time.go b/pkg/stanza/internal/time/time.go new file mode 100644 index 000000000000..79562212c861 --- /dev/null +++ b/pkg/stanza/internal/time/time.go @@ -0,0 +1,35 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package time // import "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/internal/time" + +import ( + "time" + + "github.com/jonboulle/clockwork" +) + +var Now = time.Now +var Since = time.Since + +// Clock where Now() always returns a greater value than the previous return value +type AlwaysIncreasingClock struct { + clockwork.FakeClock +} + +func NewAlwaysIncreasingClock() AlwaysIncreasingClock { + return AlwaysIncreasingClock{ + FakeClock: clockwork.NewFakeClock(), + } +} + +func (c AlwaysIncreasingClock) Now() time.Time { + c.FakeClock.Advance(time.Nanosecond) + return c.FakeClock.Now() +} + +func (c AlwaysIncreasingClock) Since(t time.Time) time.Duration { + // ensure that internal c.FakeClock.Now() will return a greater value + c.FakeClock.Advance(time.Nanosecond) + return c.FakeClock.Since(t) +} diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index d51139fc8ea2..9ba1b528fc2b 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -32,6 +32,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 1a3ac315d7c7..4243513829d1 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -31,6 +31,7 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect From 5d772dff1018264f4a78a8602d70d33d79aa973c Mon Sep 17 00:00:00 2001 From: odubajDT <93584209+odubajDT@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:27:59 +0200 Subject: [PATCH 06/30] [chore][extensions/jaegerremotesampling]: replace `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` (#34224) **Description:** - replaces `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` in `jaegerremotesampleing extension` **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34190 **Connected PRs:** - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34221 - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34226 --------- Signed-off-by: odubajDT --- extension/jaegerremotesampling/go.mod | 2 +- extension/jaegerremotesampling/go.sum | 4 +- .../internal/remote_strategy_cache.go | 10 ++--- .../internal/remote_strategy_cache_test.go | 37 +++++++++++-------- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index b0ecd4e30964..e3db41ac6a16 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -5,9 +5,9 @@ go 1.21.0 require ( github.com/fortytw2/leaktest v1.3.0 github.com/jaegertracing/jaeger v1.59.0 + github.com/jonboulle/clockwork v0.4.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.105.0 github.com/stretchr/testify v1.9.0 - github.com/tilinna/clock v1.1.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/config/configgrpc v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/config/confighttp v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 918882e46c53..de790a2503b1 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -43,6 +43,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jaegertracing/jaeger v1.59.0 h1:p9/nJxdoCxq4NSgVN8P0aDqlGSfxFaggpNfLwhqQZRc= github.com/jaegertracing/jaeger v1.59.0/go.mod h1:IZeUGtxNIYWGD3PVI4mqAn2IWVrfGdfswB8XK0mzZ0w= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= 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/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -119,8 +121,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= diff --git a/extension/jaegerremotesampling/internal/remote_strategy_cache.go b/extension/jaegerremotesampling/internal/remote_strategy_cache.go index 16129055072c..cb6375c2ce0b 100644 --- a/extension/jaegerremotesampling/internal/remote_strategy_cache.go +++ b/extension/jaegerremotesampling/internal/remote_strategy_cache.go @@ -9,7 +9,7 @@ import ( "time" "github.com/jaegertracing/jaeger/proto-gen/api_v2" - "github.com/tilinna/clock" + "github.com/jonboulle/clockwork" ) type serviceStrategyCache interface { @@ -78,7 +78,7 @@ func (c *serviceStrategyTTLCache) put( defer c.rw.Unlock() c.items[serviceName] = serviceStrategyCacheEntry{ strategyResponse: response, - retrievedAt: clock.Now(ctx), + retrievedAt: clockwork.FromContext(ctx).Now(), } } @@ -89,10 +89,10 @@ func (c *serviceStrategyTTLCache) periodicallyClearCache( ctx context.Context, schedulingPeriod time.Duration, ) { - ticker := clock.NewTicker(ctx, schedulingPeriod) + ticker := clockwork.FromContext(ctx).NewTicker(schedulingPeriod) for { select { - case <-ticker.C: + case <-ticker.Chan(): c.rw.Lock() newItems := make(map[string]serviceStrategyCacheEntry, initialRemoteResponseCacheSize) for serviceName, item := range c.items { @@ -115,7 +115,7 @@ func (c *serviceStrategyTTLCache) Close() error { } func (c *serviceStrategyTTLCache) staleItem(ctx context.Context, item serviceStrategyCacheEntry) bool { - return clock.Now(ctx).After(item.retrievedAt.Add(c.itemTTL)) + return clockwork.FromContext(ctx).Now().After(item.retrievedAt.Add(c.itemTTL)) } type noopStrategyCache struct{} diff --git a/extension/jaegerremotesampling/internal/remote_strategy_cache_test.go b/extension/jaegerremotesampling/internal/remote_strategy_cache_test.go index 7bd6c4fa767c..22f03b30a076 100644 --- a/extension/jaegerremotesampling/internal/remote_strategy_cache_test.go +++ b/extension/jaegerremotesampling/internal/remote_strategy_cache_test.go @@ -12,8 +12,8 @@ import ( "github.com/fortytw2/leaktest" "github.com/jaegertracing/jaeger/proto-gen/api_v2" + "github.com/jonboulle/clockwork" "github.com/stretchr/testify/assert" - "github.com/tilinna/clock" ) const cacheTestItemTTL = 50 * time.Millisecond @@ -48,9 +48,11 @@ var testStrategyResponseB = &api_v2.SamplingStrategyResponse{ func Test_serviceStrategyCache_ReadWriteSequence(t *testing.T) { testTime := time.Date(2023, 1, 1, 10, 0, 0, 0, time.UTC) - mock := clock.NewMock(testTime) - ctx, cfn := mock.DeadlineContext(context.Background(), testTime.Add(3*time.Minute)) - defer cfn() + mock := clockwork.NewFakeClockAt(testTime) + _ = mock.After(3 * time.Minute) + + ctx, cancel := context.WithCancel(clockwork.AddToContext(context.Background(), mock)) + defer cancel() cache := newServiceStrategyCache(cacheTestItemTTL).(*serviceStrategyTTLCache) defer func() { @@ -91,7 +93,7 @@ func Test_serviceStrategyCache_ReadWriteSequence(t *testing.T) { }, cache.items["fooSvc"]) // advance time (still within TTL time range) - mock.Add(20 * time.Millisecond) + mock.Advance(20 * time.Millisecond) // the written item is still available result, ok = cache.get(ctx, "fooSvc") @@ -102,7 +104,7 @@ func Test_serviceStrategyCache_ReadWriteSequence(t *testing.T) { assert.Nil(t, result) // advance time (just before end of TTL time range) - mock.Add(30 * time.Millisecond) + mock.Advance(30 * time.Millisecond) // the written item is still available result, ok = cache.get(ctx, "fooSvc") @@ -113,7 +115,7 @@ func Test_serviceStrategyCache_ReadWriteSequence(t *testing.T) { assert.Nil(t, result) // advance time (across TTL range) - mock.Add(1 * time.Millisecond) + mock.Advance(1 * time.Millisecond) // the (now stale) cached item is no longer available result, ok = cache.get(ctx, "fooSvc") @@ -131,9 +133,11 @@ func Test_serviceStrategyCache_ReadWriteSequence(t *testing.T) { func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { startTime := time.Date(2023, 1, 1, 10, 0, 0, 0, time.UTC) - mock := clock.NewMock(startTime) - ctx, cfn := mock.DeadlineContext(context.Background(), startTime.Add(3*time.Minute)) - defer cfn() + mock := clockwork.NewFakeClockAt(startTime) + _ = mock.After(3 * time.Minute) + + ctx, cancel := context.WithCancel(clockwork.AddToContext(context.Background(), mock)) + defer cancel() cache := newServiceStrategyCache(cacheTestItemTTL).(*serviceStrategyTTLCache) defer func() { @@ -149,12 +153,12 @@ func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { assert.Nil(t, result) // perform a write for barSvc at startTime + 10ms - firstWriteTime := mock.Add(10 * time.Millisecond) + mock.Advance(10 * time.Millisecond) cache.put(ctx, "barSvc", testStrategyResponseA) // whitebox assert for internal timestamp tracking assert.Equal(t, serviceStrategyCacheEntry{ - retrievedAt: firstWriteTime, + retrievedAt: mock.Now(), strategyResponse: testStrategyResponseA, }, cache.items["barSvc"]) @@ -167,7 +171,7 @@ func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { assert.Equal(t, testStrategyResponseA, result) // advance time (still within TTL time range) - mock.Add(10 * time.Millisecond) + mock.Advance(10 * time.Millisecond) // the written item is still available result, ok = cache.get(ctx, "fooSvc") @@ -178,8 +182,9 @@ func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { assert.Equal(t, testStrategyResponseA, result) // perform a write for barSvc at startTime + 30ms (still within TTL, but we retain this more recent data) - secondWriteTime := mock.Add(10 * time.Millisecond) + mock.Advance(10 * time.Millisecond) cache.put(ctx, "barSvc", testStrategyResponseB) + secondWriteTime := mock.Now() // whitebox assert for internal timestamp tracking (post-write, still-fresh cache entry replaced with newer data) assert.Equal(t, serviceStrategyCacheEntry{ @@ -196,7 +201,7 @@ func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { assert.Equal(t, testStrategyResponseB, result) // advance time (to end of what is now a new/full TTL for the new fresh item) - mock.Add(cacheTestItemTTL) + mock.Advance(cacheTestItemTTL) result, ok = cache.get(ctx, "fooSvc") assert.False(t, ok) @@ -206,7 +211,7 @@ func Test_serviceStrategyCache_WritesUpdateTimestamp(t *testing.T) { assert.Equal(t, testStrategyResponseB, result) // advance time beyond the newer item's TTL - mock.Add(1) + mock.Advance(1) // the (now stale) cached item is no longer available result, ok = cache.get(ctx, "fooSvc") From 5f7025aba155d805d1de92396e795e2dc87e00bb Mon Sep 17 00:00:00 2001 From: odubajDT <93584209+odubajDT@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:01:57 +0200 Subject: [PATCH 07/30] [chore][receiver/chrony]: replace `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` (#34221) **Description:** - replaces `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` in `chrony receiver` **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34190 **Connected PRs:** - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34224 - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34226 **Notes:** The failing check is not caused by changes in this PR, it's a flaky test https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33865 --------- Signed-off-by: odubajDT --- receiver/chronyreceiver/go.mod | 2 +- receiver/chronyreceiver/go.sum | 4 ++-- receiver/chronyreceiver/internal/chrony/client.go | 7 ++++--- receiver/chronyreceiver/scraper.go | 6 +++--- receiver/chronyreceiver/scraper_test.go | 6 +++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 4795a6db98a6..ab999e72a899 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -5,8 +5,8 @@ go 1.21.0 require ( github.com/facebook/time v0.0.0-20240510113249-fa89cc575891 github.com/google/go-cmp v0.6.0 + github.com/jonboulle/clockwork v0.4.0 github.com/stretchr/testify v1.9.0 - github.com/tilinna/clock v1.1.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index a138d3856051..3aa4b64738f7 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -23,6 +23,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= 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/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -69,8 +71,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= diff --git a/receiver/chronyreceiver/internal/chrony/client.go b/receiver/chronyreceiver/internal/chrony/client.go index 159ed37f3959..4ed1ae7486d9 100644 --- a/receiver/chronyreceiver/internal/chrony/client.go +++ b/receiver/chronyreceiver/internal/chrony/client.go @@ -11,7 +11,7 @@ import ( "time" "github.com/facebook/time/ntp/chrony" - "github.com/tilinna/clock" + "github.com/jonboulle/clockwork" ) var ( @@ -76,7 +76,7 @@ func (c *client) GetTrackingData(ctx context.Context) (*Tracking, error) { } packet := chrony.NewTrackingPacket() - packet.SetSequence(uint32(clock.Now(ctx).UnixNano())) + packet.SetSequence(uint32(clockwork.FromContext(ctx).Now().UnixNano())) if err := binary.Write(sock, binary.BigEndian, packet); err != nil { return nil, errors.Join(err, sock.Close()) @@ -97,5 +97,6 @@ func (c *client) getContext(ctx context.Context) (context.Context, context.Cance if c.timeout == 0 { return context.WithCancel(ctx) } - return clock.TimeoutContext(ctx, c.timeout) + + return context.WithTimeout(ctx, c.timeout) } diff --git a/receiver/chronyreceiver/scraper.go b/receiver/chronyreceiver/scraper.go index 6597a9007686..a49f23851e58 100644 --- a/receiver/chronyreceiver/scraper.go +++ b/receiver/chronyreceiver/scraper.go @@ -6,7 +6,7 @@ package chronyreceiver // import "github.com/open-telemetry/opentelemetry-collec import ( "context" - "github.com/tilinna/clock" + "github.com/jonboulle/clockwork" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver" @@ -23,7 +23,7 @@ type chronyScraper struct { func newScraper(ctx context.Context, cfg *Config, set receiver.Settings) *chronyScraper { return &chronyScraper{ mb: metadata.NewMetricsBuilder(cfg.MetricsBuilderConfig, set, - metadata.WithStartTime(pcommon.NewTimestampFromTime(clock.FromContext(ctx).Now())), + metadata.WithStartTime(pcommon.NewTimestampFromTime(clockwork.FromContext(ctx).Now())), ), } } @@ -34,7 +34,7 @@ func (cs *chronyScraper) scrape(ctx context.Context) (pmetric.Metrics, error) { return pmetric.Metrics{}, err } - now := pcommon.NewTimestampFromTime(clock.Now(ctx)) + now := pcommon.NewTimestampFromTime(clockwork.FromContext(ctx).Now()) cs.mb.RecordNtpStratumDataPoint(now, int64(data.Stratum)) cs.mb.RecordNtpTimeCorrectionDataPoint( diff --git a/receiver/chronyreceiver/scraper_test.go b/receiver/chronyreceiver/scraper_test.go index 78fd7143502d..4f972716cd75 100644 --- a/receiver/chronyreceiver/scraper_test.go +++ b/receiver/chronyreceiver/scraper_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" + "github.com/jonboulle/clockwork" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/tilinna/clock" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/receiver/receivertest" @@ -106,7 +106,7 @@ func TestChronyScraper(t *testing.T) { // Clock allows for us to pin the time to // simplify checking the metrics - clck := clock.NewMock(time.Unix(100, 0)) + clck := clockwork.NewFakeClockAt(time.Unix(100, 0)) for _, tc := range tests { t.Run(tc.scenario, func(t *testing.T) { @@ -114,7 +114,7 @@ func TestChronyScraper(t *testing.T) { chronym.On("GetTrackingData").Return(tc.mockTracking, tc.mockErr) - ctx := clock.Context(context.Background(), clck) + ctx := clockwork.AddToContext(context.Background(), clck) scraper := newScraper(ctx, tc.conf, receivertest.NewNopSettings()) scraper.client = chronym From c89bcbde7ff86e4e28c54ffdeedb9dd9798fae51 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 07:16:06 -0700 Subject: [PATCH 08/30] Update module google.golang.org/api to v0.189.0 (#34222) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [google.golang.org/api](https://togithub.com/googleapis/google-api-go-client) | `v0.188.0` -> `v0.189.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/google.golang.org%2fapi/v0.189.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/google.golang.org%2fapi/v0.189.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/google.golang.org%2fapi/v0.188.0/v0.189.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/google.golang.org%2fapi/v0.188.0/v0.189.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
googleapis/google-api-go-client (google.golang.org/api) ### [`v0.189.0`](https://togithub.com/googleapis/google-api-go-client/releases/tag/v0.189.0) [Compare Source](https://togithub.com/googleapis/google-api-go-client/compare/v0.188.0...v0.189.0) ##### Features - **all:** Auto-regenerate discovery clients ([#​2680](https://togithub.com/googleapis/google-api-go-client/issues/2680)) ([4a713f7](https://togithub.com/googleapis/google-api-go-client/commit/4a713f714e522fc9b642b6e877f387b45b45d92c)) - **all:** Auto-regenerate discovery clients ([#​2683](https://togithub.com/googleapis/google-api-go-client/issues/2683)) ([1e3757d](https://togithub.com/googleapis/google-api-go-client/commit/1e3757d0fae889f480bdd54dfeb09362ca0ac6d9)) - **all:** Auto-regenerate discovery clients ([#​2685](https://togithub.com/googleapis/google-api-go-client/issues/2685)) ([611884d](https://togithub.com/googleapis/google-api-go-client/commit/611884d3f736ca0ac205859dc428537ab167fd19)) - **all:** Auto-regenerate discovery clients ([#​2687](https://togithub.com/googleapis/google-api-go-client/issues/2687)) ([27405af](https://togithub.com/googleapis/google-api-go-client/commit/27405af8ca136a1c64f413f4fc3f0db57c53b80f)) - **all:** Auto-regenerate discovery clients ([#​2691](https://togithub.com/googleapis/google-api-go-client/issues/2691)) ([a94722f](https://togithub.com/googleapis/google-api-go-client/commit/a94722f1bfc635faedebf847230fc97b9845f390)) ##### Bug Fixes - **cba:** Update newAuth path to use nil oauth2 client ([#​2684](https://togithub.com/googleapis/google-api-go-client/issues/2684)) ([d925dcb](https://togithub.com/googleapis/google-api-go-client/commit/d925dcbb27f2412664b43259cc4840d0f952857f)) - **transport/grpc:** Retain UserAgent option with new auth stack ([#​2690](https://togithub.com/googleapis/google-api-go-client/issues/2690)) ([aa4662f](https://togithub.com/googleapis/google-api-go-client/commit/aa4662f7581724e440a9530d84d10264ff974c81))
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> --- cmd/otelcontribcol/go.mod | 10 ++++----- cmd/otelcontribcol/go.sum | 20 +++++++++--------- exporter/googlecloudpubsubexporter/go.mod | 12 +++++------ exporter/googlecloudpubsubexporter/go.sum | 24 +++++++++++----------- receiver/googlecloudpubsubreceiver/go.mod | 12 +++++------ receiver/googlecloudpubsubreceiver/go.sum | 24 +++++++++++----------- receiver/googlecloudspannerreceiver/go.mod | 12 +++++------ receiver/googlecloudspannerreceiver/go.sum | 24 +++++++++++----------- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 59641d1d580e..40ec45106901 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -244,8 +244,8 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.9.0 // indirect cel.dev/expr v0.15.0 // indirect cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.10 // indirect cloud.google.com/go/logging v1.10.0 // indirect @@ -814,10 +814,10 @@ require ( golang.org/x/tools v0.22.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/api v0.188.0 // indirect - google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/api v0.189.0 // indirect + google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index ebd50c25d48d..4dfab2276ccc 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -103,10 +103,10 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= -cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= -cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= -cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= -cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= +cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= @@ -3059,8 +3059,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= -google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -3203,12 +3203,12 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 757ee39d8042..4ff309342ee6 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -15,15 +15,15 @@ require ( go.opentelemetry.io/otel/metric v1.28.0 go.opentelemetry.io/otel/trace v1.28.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.188.0 + google.golang.org/api v0.189.0 google.golang.org/grpc v1.65.0 ) require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect - cloud.google.com/go/compute/metadata v0.4.0 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.10 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -77,9 +77,9 @@ require ( golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 32a334544aeb..5f91c7cdfc84 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -1,12 +1,12 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= -cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= -cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= -cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= -cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c= -cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M= +cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI= cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps= cloud.google.com/go/pubsub v1.40.0 h1:0LdP+zj5XaPAGtWr2V6r88VXJlmtaB/+fde1q3TU8M0= @@ -234,19 +234,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= -google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 2ee7c16def24..51e46cb7b40a 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -20,8 +20,8 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.188.0 - google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b + google.golang.org/api v0.189.0 + google.golang.org/genproto v0.0.0-20240722135656-d784300faade google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 google.golang.org/grpc v1.65.0 google.golang.org/protobuf v1.34.2 @@ -29,9 +29,9 @@ require ( require ( cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect - cloud.google.com/go/compute/metadata v0.4.0 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.10 // indirect cloud.google.com/go/longrunning v0.5.9 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -84,7 +84,7 @@ require ( golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 367d3a78afc5..cefcf310b5ac 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -1,12 +1,12 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= -cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= -cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= -cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= -cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= -cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c= -cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M= +cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/iam v1.1.10 h1:ZSAr64oEhQSClwBL670MsJAW5/RLiC6kfw3Bqmd5ZDI= cloud.google.com/go/iam v1.1.10/go.mod h1:iEgMq62sg8zx446GCaijmA2Miwg5o3UbO+nI47WHJps= cloud.google.com/go/logging v1.10.0 h1:f+ZXMqyrSJ5vZ5pE/zr0xC8y/M9BLNzQeLBwfeZ+wY4= @@ -240,19 +240,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= -google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index c5295f3c2060..94a51618ac4b 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -17,7 +17,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 - google.golang.org/api v0.188.0 + google.golang.org/api v0.189.0 google.golang.org/grpc v1.65.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -25,9 +25,9 @@ require ( require ( cel.dev/expr v0.15.0 // indirect cloud.google.com/go v0.115.0 // indirect - cloud.google.com/go/auth v0.7.0 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect - cloud.google.com/go/compute/metadata v0.4.0 // indirect + cloud.google.com/go/auth v0.7.2 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect cloud.google.com/go/iam v1.1.10 // indirect cloud.google.com/go/longrunning v0.5.9 // indirect github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect @@ -84,9 +84,9 @@ require ( golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/protobuf v1.34.2 // indirect ) diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index a8aa29425138..0c5e077b13d2 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -101,10 +101,10 @@ cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVo cloud.google.com/go/assuredworkloads v1.8.0/go.mod h1:AsX2cqyNCOvEQC8RMPnoc0yEarXQk6WEKkxYfL6kGIo= cloud.google.com/go/assuredworkloads v1.9.0/go.mod h1:kFuI1P78bplYtT77Tb1hi0FMxM0vVpRC7VVoJC3ZoT0= cloud.google.com/go/assuredworkloads v1.10.0/go.mod h1:kwdUQuXcedVdsIaKgKTp9t0UJkE5+PAVNhdQm4ZVq2E= -cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= -cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= -cloud.google.com/go/auth/oauth2adapt v0.2.2 h1:+TTV8aXpjeChS9M+aTtN/TjdQnzJvmzKFt//oWu7HX4= -cloud.google.com/go/auth/oauth2adapt v0.2.2/go.mod h1:wcYjgpZI9+Yu7LyYBg4pqSiaRkfEK3GQcpb7C/uyF1Q= +cloud.google.com/go/auth v0.7.2 h1:uiha352VrCDMXg+yoBtaD0tUF4Kv9vrtrWPYXwutnDE= +cloud.google.com/go/auth v0.7.2/go.mod h1:VEc4p5NNxycWQTMQEDQF0bd6aTMb6VgYDXEwiJJQAbs= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0= cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8= cloud.google.com/go/automl v1.7.0/go.mod h1:RL9MYCCsJEOmt0Wf3z9uzG0a7adTT1fe+aObgSpkCt8= @@ -184,8 +184,8 @@ cloud.google.com/go/compute/metadata v0.1.0/go.mod h1:Z1VN+bulIf6bt4P/C37K4DyZYZ cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= -cloud.google.com/go/compute/metadata v0.4.0 h1:vHzJCWaM4g8XIcm8kopr3XmDA4Gy/lblD3EhhSux05c= -cloud.google.com/go/compute/metadata v0.4.0/go.mod h1:SIQh1Kkb4ZJ8zJ874fqVkslA29PRXuleyj6vOzlbK7M= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= cloud.google.com/go/contactcenterinsights v1.3.0/go.mod h1:Eu2oemoePuEFc/xKFPjbTuPSj0fYJcPls9TFlPNnHHY= cloud.google.com/go/contactcenterinsights v1.4.0/go.mod h1:L2YzkGbPsv+vMQMCADxJoT9YiTTnSEd6fEvCeHTYVck= cloud.google.com/go/contactcenterinsights v1.6.0/go.mod h1:IIDlT6CLcDoyv79kDv8iWxMSTZhLxSCofVV5W6YFM/w= @@ -1429,8 +1429,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/ google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI= google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0= google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg= -google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= -google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= +google.golang.org/api v0.189.0 h1:equMo30LypAkdkLMBqfeIqtyAnlyig1JSZArl4XPwdI= +google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1570,12 +1570,12 @@ google.golang.org/genproto v0.0.0-20230323212658-478b75c54725/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= -google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= +google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b h1:04+jVzTs2XBnOZcPsLnmrTGqltqJbZQ1Ey26hjYdQQ0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240708141625-4ad9e859172b/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= From ee8218dba82d8cafe9868cfcf3017d781a6b76df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 07:48:23 -0700 Subject: [PATCH 09/30] Update module github.com/redis/go-redis/v9 to v9.6.0 (#34218) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/redis/go-redis/v9](https://togithub.com/redis/go-redis) | `v9.5.4` -> `v9.6.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fredis%2fgo-redis%2fv9/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fredis%2fgo-redis%2fv9/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fredis%2fgo-redis%2fv9/v9.5.4/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fredis%2fgo-redis%2fv9/v9.5.4/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | | [github.com/redis/go-redis/v9](https://togithub.com/redis/go-redis) | `v9.5.1` -> `v9.6.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fredis%2fgo-redis%2fv9/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fredis%2fgo-redis%2fv9/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fredis%2fgo-redis%2fv9/v9.5.1/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fredis%2fgo-redis%2fv9/v9.5.1/v9.6.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
redis/go-redis (github.com/redis/go-redis/v9) ### [`v9.6.0`](https://togithub.com/redis/go-redis/releases/tag/v9.6.0): 9.6.0 ### Changes #### 🚀 New Features - Support Hash-field expiration commands ([#​2991](https://togithub.com/redis/go-redis/issues/2991)) - Support Hash-field expiration commands in Pipeline & Fix HExpire HExpireWithArgs expiration ([#​3038](https://togithub.com/redis/go-redis/issues/3038)) - Support NOVALUES parameter for HSCAN ([#​2925](https://togithub.com/redis/go-redis/issues/2925)) - Added test case for CLIENT KILL with MAXAGE option ([#​2971](https://togithub.com/redis/go-redis/issues/2971)) - Add support for XREAD last entry ([#​3005](https://togithub.com/redis/go-redis/issues/3005)) - Reduce the type assertion of CheckConn ([#​3066](https://togithub.com/redis/go-redis/issues/3066)) #### 🛠️ Improvements This release includes support for Redis Community Edition (CE) 7.4.0, ensuring compatibility with the latest features and improvements introduced in Redis CE 7.4.0. #### 🧰 Maintenance - chore(deps): bump golangci/golangci-lint-action from 4 to 6 ([#​2993](https://togithub.com/redis/go-redis/issues/2993)) - Avoid unnecessary retry delay in cluster client following MOVED and ASK redirection ([#​3048](https://togithub.com/redis/go-redis/issues/3048)) - add test for tls connCheck [#​3025](https://togithub.com/redis/go-redis/issues/3025) ([#​3047](https://togithub.com/redis/go-redis/issues/3047)) - fix node routing in slotClosestNode ([#​3043](https://togithub.com/redis/go-redis/issues/3043)) - Update pubsub.go ([#​3042](https://togithub.com/redis/go-redis/issues/3042)) - Change monitor test to run manually ([#​3041](https://togithub.com/redis/go-redis/issues/3041)) - chore(deps): bump rojopolis/spellcheck-github-actions from 0.36.0 to 0.38.0 ([#​3028](https://togithub.com/redis/go-redis/issues/3028)) - Add `(*StatusCmd).Bytes()` method ([#​3030](https://togithub.com/redis/go-redis/issues/3030)) - chore(deps): bump golang.org/x/net from 0.20.0 to 0.23.0 in /example/otel ([#​3000](https://togithub.com/redis/go-redis/issues/3000)) #### Contributors We'd like to thank all the contributors who worked on this release! [@​LINKIWI](https://togithub.com/LINKIWI), [@​b1ron](https://togithub.com/b1ron), [@​dependabot](https://togithub.com/dependabot), [@​dependabot](https://togithub.com/dependabot)\[bot], [@​gerzse](https://togithub.com/gerzse), [@​haines](https://togithub.com/haines), [@​immersedin](https://togithub.com/immersedin), [@​naiqianz](https://togithub.com/naiqianz), [@​ofekshenawa](https://togithub.com/ofekshenawa), [@​srikar-jilugu](https://togithub.com/srikar-jilugu), [@​tzongw](https://togithub.com/tzongw), [@​vladvildanov](https://togithub.com/vladvildanov) and [@​vmihailenco](https://togithub.com/vmihailenco) [@​monkey92t](https://togithub.com/monkey92t)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- extension/storage/redisstorageextension/go.mod | 2 +- extension/storage/redisstorageextension/go.sum | 4 ++-- receiver/redisreceiver/go.mod | 2 +- receiver/redisreceiver/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 40ec45106901..d7692ddb1e05 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -692,7 +692,7 @@ require ( github.com/prometheus/procfs v0.15.1 // indirect github.com/rabbitmq/amqp091-go v1.10.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/redis/go-redis/v9 v9.5.4 // indirect + github.com/redis/go-redis/v9 v9.6.0 // indirect github.com/relvacode/iso8601 v1.4.0 // indirect github.com/rs/cors v1.11.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 4dfab2276ccc..6ea947f66dd5 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -2092,8 +2092,8 @@ github.com/rabbitmq/amqp091-go v1.10.0 h1:STpn5XsHlHGcecLmMFCtg7mqq0RnD+zFr4uzuk github.com/rabbitmq/amqp091-go v1.10.0/go.mod h1:Hy4jKW5kQART1u+JkDTF9YYOQUHXqMuhrgxOEeS7G4o= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/redis/go-redis/v9 v9.5.4 h1:vOFYDKKVgrI5u++QvnMT7DksSMYg7Aw/Np4vLJLKLwY= -github.com/redis/go-redis/v9 v9.5.4/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= +github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= diff --git a/extension/storage/redisstorageextension/go.mod b/extension/storage/redisstorageextension/go.mod index 3b5b4164d283..4ae6bcdd0291 100644 --- a/extension/storage/redisstorageextension/go.mod +++ b/extension/storage/redisstorageextension/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/stora go 1.21.0 require ( - github.com/redis/go-redis/v9 v9.5.1 + github.com/redis/go-redis/v9 v9.6.0 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/config/configopaque v1.12.1-0.20240716231837-5753a58f712b diff --git a/extension/storage/redisstorageextension/go.sum b/extension/storage/redisstorageextension/go.sum index e8d279bce84b..9c8ee7dd1f38 100644 --- a/extension/storage/redisstorageextension/go.sum +++ b/extension/storage/redisstorageextension/go.sum @@ -53,8 +53,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8= -github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= +github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 9bb03c6d4006..af81823700ce 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.105.0 - github.com/redis/go-redis/v9 v9.5.4 + github.com/redis/go-redis/v9 v9.6.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.31.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 60204c692c30..2d8813ee3bff 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -125,8 +125,8 @@ github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/redis/go-redis/v9 v9.5.4 h1:vOFYDKKVgrI5u++QvnMT7DksSMYg7Aw/Np4vLJLKLwY= -github.com/redis/go-redis/v9 v9.5.4/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= +github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= From fae162db3b2c13825bafc16bdd8ce4f3d152a3d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:03:37 -0700 Subject: [PATCH 10/30] Update module github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common to v1.0.969 (#34206) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common](https://togithub.com/tencentcloud/tencentcloud-sdk-go) | `v1.0.965` -> `v1.0.969` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2ftencentcloud%2ftencentcloud-sdk-go%2ftencentcloud%2fcommon/v1.0.969?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2ftencentcloud%2ftencentcloud-sdk-go%2ftencentcloud%2fcommon/v1.0.969?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2ftencentcloud%2ftencentcloud-sdk-go%2ftencentcloud%2fcommon/v1.0.965/v1.0.969?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2ftencentcloud%2ftencentcloud-sdk-go%2ftencentcloud%2fcommon/v1.0.965/v1.0.969?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
tencentcloud/tencentcloud-sdk-go (github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common) ### [`v1.0.969`](https://togithub.com/tencentcloud/tencentcloud-sdk-go/blob/HEAD/CHANGELOG.md#Release-v10969) [Compare Source](https://togithub.com/tencentcloud/tencentcloud-sdk-go/compare/v1.0.968...v1.0.969) #### 弹性伸缩(as) 版本:2018-04-19 ##### 第 71 次发布 发布时间:2024-07-23 01:04:47 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [DataDisk](https://cloud.tencent.com/document/api/377/20453#DataDisk) - 新增成员:BurstPerformance - [InstanceNameSettings](https://cloud.tencent.com/document/api/377/20453#InstanceNameSettings) - 新增成员:InstanceNameSuffix #### 云联络中心(ccc) 版本:2020-02-10 ##### 第 70 次发布 发布时间:2024-07-23 01:10:10 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [SkillGroupInfoItem](https://cloud.tencent.com/document/api/679/47715#SkillGroupInfoItem) - 新增成员:Alias #### 云数据库 MySQL(cdb) 版本:2017-03-20 ##### 第 161 次发布 发布时间:2024-07-23 01:10:42 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [UpgradeDBInstanceEngineVersion](https://cloud.tencent.com/document/api/236/15870) - 新增入参:ParamList 新增数据结构: - [UpgradeEngineVersionParams](https://cloud.tencent.com/document/api/236/15878#UpgradeEngineVersionParams) #### 腾讯电子签企业版(ess) 版本:2020-11-11 ##### 第 180 次发布 发布时间:2024-07-23 01:33:50 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [CreatePartnerAutoSignAuthUrl](https://cloud.tencent.com/document/api/1323/109065) #### 腾讯混元大模型(hunyuan) 版本:2023-09-01 ##### 第 13 次发布 发布时间:2024-07-23 01:37:38 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult) - **修改成员**:Index #### 流计算 Oceanus(oceanus) 版本:2019-04-22 ##### 第 60 次发布 发布时间:2024-07-23 01:53:12 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [RunJobDescription](https://cloud.tencent.com/document/api/849/52010#RunJobDescription) - 新增成员:KafkaScanMode #### 云数据库 PostgreSQL(postgres) 版本:2017-03-12 ##### 第 44 次发布 发布时间:2024-07-23 01:55:36 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [CreateAccount](https://cloud.tencent.com/document/api/409/109071) - [DeleteAccount](https://cloud.tencent.com/document/api/409/109070) - [DescribeAccountPrivileges](https://cloud.tencent.com/document/api/409/109069) - [DescribeDatabaseObjects](https://cloud.tencent.com/document/api/409/109072) - [LockAccount](https://cloud.tencent.com/document/api/409/109068) - [ModifyAccountPrivileges](https://cloud.tencent.com/document/api/409/109067) - [UnlockAccount](https://cloud.tencent.com/document/api/409/109066) 新增数据结构: - [DatabaseObject](https://cloud.tencent.com/document/api/409/16778#DatabaseObject) - [DatabasePrivilege](https://cloud.tencent.com/document/api/409/16778#DatabasePrivilege) - [ModifyPrivilege](https://cloud.tencent.com/document/api/409/16778#ModifyPrivilege) #### 全栈式风控引擎(rce) 版本:2020-11-03 ##### 第 11 次发布 发布时间:2024-07-23 01:57:03 本次发布包含了以下内容: 改善已有的文档。 新增数据结构: - [DataAuthorizationInfo](https://cloud.tencent.com/document/api/1343/52566#DataAuthorizationInfo) 修改数据结构: - [InputManageMarketingRisk](https://cloud.tencent.com/document/api/1343/52566#InputManageMarketingRisk) - 新增成员:DataAuthorization #### 容器镜像服务(tcr) 版本:2019-09-24 ##### 第 67 次发布 发布时间:2024-07-23 02:04:12 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [DescribeImageManifests](https://cloud.tencent.com/document/api/1141/43525) - 新增出参:Labels, Size #### Web 应用防火墙(waf) 版本:2018-01-25 ##### 第 94 次发布 发布时间:2024-07-23 02:21:00 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [AddAttackWhiteRule](https://cloud.tencent.com/document/api/627/100203) - 新增入参:TypeIds, Mode, Name - [CreateIpAccessControl](https://cloud.tencent.com/document/api/627/105915) - 新增入参:JobType, JobDateTime - [DescribeInstances](https://cloud.tencent.com/document/api/627/75922) - 新增入参:FreeDelayFlag - [DescribeIpAccessControl](https://cloud.tencent.com/document/api/627/72645) - 新增入参:TimerType - [ModifyAttackWhiteRule](https://cloud.tencent.com/document/api/627/100200) - 新增入参:TypeIds, Mode, Name - [ModifyIpAccessControl](https://cloud.tencent.com/document/api/627/105912) - 新增入参:JobType, JobDateTime - [UpsertCCRule](https://cloud.tencent.com/document/api/627/97646) - 新增入参:Length 修改数据结构: - [BatchIpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#BatchIpAccessControlItem) - 新增成员:JobType, CronType, JobDateTime, ValidStatus - [CCRuleItem](https://cloud.tencent.com/document/api/627/53609#CCRuleItem) - 新增成员:Length, RuleId, EventId, SessionApplied, CreateTime - [InstanceInfo](https://cloud.tencent.com/document/api/627/53609#InstanceInfo) - 新增成员:FreeDelayFlag - [IpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#IpAccessControlItem) - 新增成员:JobType, CronType, JobDateTime - [UserSignatureRule](https://cloud.tencent.com/document/api/627/53609#UserSignatureRule) - 新增成员:RiskLevel - [UserWhiteRule](https://cloud.tencent.com/document/api/627/53609#UserWhiteRule) - 新增成员:MatchParams, SignatureIds, TypeIds, TypeId, Mode, Name, MatchInfo, MatchInfoStr - [UserWhiteRuleItem](https://cloud.tencent.com/document/api/627/53609#UserWhiteRuleItem) - 新增成员:MatchParams ### [`v1.0.968`](https://togithub.com/tencentcloud/tencentcloud-sdk-go/blob/HEAD/CHANGELOG.md#Release-v10968) [Compare Source](https://togithub.com/tencentcloud/tencentcloud-sdk-go/compare/v1.0.967...v1.0.968) #### 消息队列 CKafka 版(ckafka) 版本:2019-08-19 ##### 第 106 次发布 发布时间:2024-07-22 01:20:34 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [ModifyRoutineMaintenanceTask](https://cloud.tencent.com/document/api/597/109042) #### 云服务器(cvm) 版本:2017-03-12 ##### 第 128 次发布 发布时间:2024-07-22 01:24:41 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [EnterRescueMode](https://cloud.tencent.com/document/api/213/109044) - [ExitRescueMode](https://cloud.tencent.com/document/api/213/109043) #### TDSQL-C MySQL 版(cynosdb) 版本:2019-01-07 ##### 第 97 次发布 发布时间:2024-07-22 01:29:16 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [ExportResourcePackageDeductDetails](https://cloud.tencent.com/document/api/1003/109046) - [ModifyResourcePackagesDeductionPriority](https://cloud.tencent.com/document/api/1003/109045) 新增数据结构: - [PackagePriority](https://cloud.tencent.com/document/api/1003/48097#PackagePriority) #### Elasticsearch Service(es) 版本:2018-04-16 ##### 第 63 次发布 发布时间:2024-07-22 01:39:08 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [RestartNodes](https://cloud.tencent.com/document/api/845/48473) - 新增入参:ShardAllocationConcurrents, ShardAllocationBytes - [UpgradeInstance](https://cloud.tencent.com/document/api/845/36270) - 新增入参:ShardAllocationConcurrents, ShardAllocationBytes #### 腾讯混元大模型(hunyuan) 版本:2023-09-01 ##### 第 12 次发布 发布时间:2024-07-22 01:43:41 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [ChatCompletions](https://cloud.tencent.com/document/api/1729/105701) - 新增入参:SearchInfo - 新增出参:SearchInfo 新增数据结构: - [SearchInfo](https://cloud.tencent.com/document/api/1729/101838#SearchInfo) - [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult) #### 多网聚合加速(mna) 版本:2021-01-19 ##### 第 21 次发布 发布时间:2024-07-22 01:55:24 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [AddL3Conn](https://cloud.tencent.com/document/api/1385/109052) - [DeleteL3Conn](https://cloud.tencent.com/document/api/1385/109051) - [GetL3ConnList](https://cloud.tencent.com/document/api/1385/109050) - [UpdateL3Cidr](https://cloud.tencent.com/document/api/1385/109049) - [UpdateL3Conn](https://cloud.tencent.com/document/api/1385/109048) - [UpdateL3Switch](https://cloud.tencent.com/document/api/1385/109047) 新增数据结构: - [L3ConnInfo](https://cloud.tencent.com/document/api/1385/55846#L3ConnInfo) #### 私有网络(vpc) 版本:2017-03-12 ##### 第 196 次发布 发布时间:2024-07-22 02:25:36 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [InstanceBind](https://cloud.tencent.com/document/api/215/15824#InstanceBind) - **修改成员**:InstanceRegion ### [`v1.0.967`](https://togithub.com/tencentcloud/tencentcloud-sdk-go/blob/HEAD/CHANGELOG.md#Release-v10967) [Compare Source](https://togithub.com/tencentcloud/tencentcloud-sdk-go/compare/v1.0.966...v1.0.967) #### 流计算 Oceanus(oceanus) 版本:2019-04-22 ##### 第 59 次发布 发布时间:2024-07-19 02:08:08 本次发布包含了以下内容: 改善已有的文档。 修改数据结构: - [Cluster](https://cloud.tencent.com/document/api/849/52010#Cluster) - 新增成员:BillingResourceMode - [ClusterGroupSetItem](https://cloud.tencent.com/document/api/849/52010#ClusterGroupSetItem) - 新增成员:BillingResourceMode ### [`v1.0.966`](https://togithub.com/tencentcloud/tencentcloud-sdk-go/blob/HEAD/CHANGELOG.md#Release-v10966) [Compare Source](https://togithub.com/tencentcloud/tencentcloud-sdk-go/compare/v1.0.965...v1.0.966) #### 云应用(cloudapp) 版本:2022-05-30 ##### 第 1 次发布 发布时间:2024-07-17 10:02:42 本次发布包含了以下内容: 改善已有的文档。 新增接口: - [VerifyLicense](https://cloud.tencent.com/document/api/1689/108874) 新增数据结构: - [License](https://cloud.tencent.com/document/api/1689/108875#License) - [SaleParam](https://cloud.tencent.com/document/api/1689/108875#SaleParam) #### 数据安全治理中心(dsgc) 版本:2019-07-23 ##### 第 16 次发布 发布时间:2024-07-18 01:10:11 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [CreateDSPADiscoveryTask](https://cloud.tencent.com/document/api/1087/97252) - 新增入参:Order, Rows, GlobalOrderField - [DescribeDSPAESDataSample](https://cloud.tencent.com/document/api/1087/97209) - 新增入参:Order, OrderField - [DescribeDSPATaskResultDataSample](https://cloud.tencent.com/document/api/1087/97203) - 新增入参:Order, OrderField #### 腾讯电子签(基础版)(essbasic) 版本:2021-05-26 ##### 第 175 次发布 发布时间:2024-07-18 01:11:43 本次发布包含了以下内容: 改善已有的文档。 修改接口: - [ChannelCreateBatchSignUrl](https://cloud.tencent.com/document/api/1420/98671) - 新增入参:OpenId, OrganizationOpenId #### 腾讯电子签(基础版)(essbasic) 版本:2020-12-22
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- exporter/tencentcloudlogserviceexporter/go.mod | 2 +- exporter/tencentcloudlogserviceexporter/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index d7692ddb1e05..864e703d1e93 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -726,7 +726,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969 // indirect github.com/tg123/go-htpasswd v1.2.2 // indirect github.com/tidwall/gjson v1.17.1 // indirect github.com/tidwall/match v1.1.1 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 6ea947f66dd5..3d862e504362 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -2223,8 +2223,8 @@ github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSW 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/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965 h1:anYs0nlI4QGebwJrbAner74TFwd/kzjzZlfEpn3Kias= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969 h1:rJlV77WbjuJ5uGBi+THOk09Cfp8Kskz9HgExq0enTmY= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/testcontainers/testcontainers-go v0.31.0 h1:W0VwIhcEVhRflwL9as3dhY6jXjVCA27AkmbnZ+UTh3U= github.com/testcontainers/testcontainers-go v0.31.0/go.mod h1:D2lAoA0zUFiSY+eAflqK5mcUx/A5hrrORaEQrd0SefI= github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6BY= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 7b114429bffc..30ffb63ee7d5 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.9.0 - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965 + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/config/configopaque v1.12.1-0.20240716231837-5753a58f712b go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index 53742cf06af9..8111adb51ec5 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -72,8 +72,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965 h1:anYs0nlI4QGebwJrbAner74TFwd/kzjzZlfEpn3Kias= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.965/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969 h1:rJlV77WbjuJ5uGBi+THOk09Cfp8Kskz9HgExq0enTmY= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.969/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= From 780dace6029a0282a7d7adbb9229152271d112a2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:08:20 -0700 Subject: [PATCH 11/30] Update module github.com/SAP/go-hdb to v1.10.1 (#34205) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/SAP/go-hdb](https://togithub.com/SAP/go-hdb) | `v1.10.0` -> `v1.10.1` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fSAP%2fgo-hdb/v1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fSAP%2fgo-hdb/v1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fSAP%2fgo-hdb/v1.10.0/v1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fSAP%2fgo-hdb/v1.10.0/v1.10.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
SAP/go-hdb (github.com/SAP/go-hdb) ### [`v1.10.1`](https://togithub.com/SAP/go-hdb/blob/HEAD/RELEASENOTES.md#v1101) [Compare Source](https://togithub.com/SAP/go-hdb/compare/v1.10.0...v1.10.1) - updated dependencies
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- internal/sqlquery/go.mod | 2 +- internal/sqlquery/go.sum | 4 ++-- receiver/saphanareceiver/go.mod | 2 +- receiver/saphanareceiver/go.sum | 4 ++-- receiver/sqlqueryreceiver/go.mod | 2 +- receiver/sqlqueryreceiver/go.sum | 4 ++-- receiver/sqlserverreceiver/go.mod | 2 +- receiver/sqlserverreceiver/go.sum | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 864e703d1e93..047f7f653844 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -373,7 +373,7 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ReneKroon/ttlcache/v2 v2.11.0 // indirect - github.com/SAP/go-hdb v1.10.0 // indirect + github.com/SAP/go-hdb v1.10.1 // indirect github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 3d862e504362..fcc864a6f350 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -920,8 +920,8 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.11.0 h1:OvlcYFYi941SBN3v9dsDcC2N8vRxyHcCmJb3Vl4QMoM= github.com/ReneKroon/ttlcache/v2 v2.11.0/go.mod h1:mBxvsNY+BT8qLLd6CuAJubbKo6r0jh3nb5et22bbfGY= -github.com/SAP/go-hdb v1.10.0 h1:M/1exZmJaO4UUCuOGQR4n/zjqiNu3scee8WjaPqHkts= -github.com/SAP/go-hdb v1.10.0/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= +github.com/SAP/go-hdb v1.10.1 h1:c9dGT5xHZNDwPL3NQcRpnNISn3MchwYaGoMZpCAllUs= +github.com/SAP/go-hdb v1.10.1/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= github.com/SermoDigital/jose v0.9.2-0.20161205224733-f6df55f235c2/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLqlyjxMR6of35vt6MVQ+eXMcgn9X/sy0FE= github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index d84cf1db54f6..1a0cf7f0b6f3 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlque go 1.21.0 require ( - github.com/SAP/go-hdb v1.10.0 + github.com/SAP/go-hdb v1.10.1 github.com/go-sql-driver/mysql v1.8.1 github.com/lib/pq v1.10.9 github.com/microsoft/go-mssqldb v1.7.2 diff --git a/internal/sqlquery/go.sum b/internal/sqlquery/go.sum index e2dc9ecee36d..2fec1c4fa48e 100644 --- a/internal/sqlquery/go.sum +++ b/internal/sqlquery/go.sum @@ -20,8 +20,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= -github.com/SAP/go-hdb v1.10.0 h1:M/1exZmJaO4UUCuOGQR4n/zjqiNu3scee8WjaPqHkts= -github.com/SAP/go-hdb v1.10.0/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= +github.com/SAP/go-hdb v1.10.1 h1:c9dGT5xHZNDwPL3NQcRpnNISn3MchwYaGoMZpCAllUs= +github.com/SAP/go-hdb v1.10.1/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= github.com/apache/arrow/go/v15 v15.0.0 h1:1zZACWf85oEZY5/kd9dsQS7i+2G5zVQcbKTHgslqHNA= github.com/apache/arrow/go/v15 v15.0.0/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index ae9c5ef0820a..0f3f7ef41c22 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/saphan go 1.21.0 require ( - github.com/SAP/go-hdb v1.10.0 + github.com/SAP/go-hdb v1.10.1 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.105.0 diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index af6d846c567b..033fbe7d3a2c 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -1,5 +1,5 @@ -github.com/SAP/go-hdb v1.10.0 h1:M/1exZmJaO4UUCuOGQR4n/zjqiNu3scee8WjaPqHkts= -github.com/SAP/go-hdb v1.10.0/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= +github.com/SAP/go-hdb v1.10.1 h1:c9dGT5xHZNDwPL3NQcRpnNISn3MchwYaGoMZpCAllUs= +github.com/SAP/go-hdb v1.10.1/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index ee8443cd8fdb..e9331f54bc1b 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -36,7 +36,7 @@ require ( github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/Microsoft/hcsshim v0.11.4 // indirect - github.com/SAP/go-hdb v1.10.0 // indirect + github.com/SAP/go-hdb v1.10.1 // indirect github.com/apache/arrow/go/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index e65674e5271f..c6642bcf2825 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -32,8 +32,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= -github.com/SAP/go-hdb v1.10.0 h1:M/1exZmJaO4UUCuOGQR4n/zjqiNu3scee8WjaPqHkts= -github.com/SAP/go-hdb v1.10.0/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= +github.com/SAP/go-hdb v1.10.1 h1:c9dGT5xHZNDwPL3NQcRpnNISn3MchwYaGoMZpCAllUs= +github.com/SAP/go-hdb v1.10.1/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= github.com/apache/arrow/go/v15 v15.0.0 h1:1zZACWf85oEZY5/kd9dsQS7i+2G5zVQcbKTHgslqHNA= github.com/apache/arrow/go/v15 v15.0.0/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 80d01adb575d..59649f6d8e43 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -31,7 +31,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1 // indirect github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect - github.com/SAP/go-hdb v1.10.0 // indirect + github.com/SAP/go-hdb v1.10.1 // indirect github.com/apache/arrow/go/v15 v15.0.0 // indirect github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index fd7f9c9658aa..1600387f614e 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -20,8 +20,8 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaC github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= -github.com/SAP/go-hdb v1.10.0 h1:M/1exZmJaO4UUCuOGQR4n/zjqiNu3scee8WjaPqHkts= -github.com/SAP/go-hdb v1.10.0/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= +github.com/SAP/go-hdb v1.10.1 h1:c9dGT5xHZNDwPL3NQcRpnNISn3MchwYaGoMZpCAllUs= +github.com/SAP/go-hdb v1.10.1/go.mod h1:vxYDca44L2eRudZv5JAI6T+IygOfxb7vOCFh/Kj0pug= github.com/apache/arrow/go/v15 v15.0.0 h1:1zZACWf85oEZY5/kd9dsQS7i+2G5zVQcbKTHgslqHNA= github.com/apache/arrow/go/v15 v15.0.0/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= From 1c98261238477ffc5721004067fa51333669c476 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 08:09:05 -0700 Subject: [PATCH 12/30] Update module github.com/vmware/govmomi to v0.39.0 (#34219) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/vmware/govmomi](https://togithub.com/vmware/govmomi) | `v0.38.0` -> `v0.39.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fvmware%2fgovmomi/v0.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fvmware%2fgovmomi/v0.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fvmware%2fgovmomi/v0.38.0/v0.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fvmware%2fgovmomi/v0.38.0/v0.39.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
vmware/govmomi (github.com/vmware/govmomi) ### [`v0.39.0`](https://togithub.com/vmware/govmomi/releases/tag/v0.39.0) [Compare Source](https://togithub.com/vmware/govmomi/compare/v0.38.0...v0.39.0) #### [Release v0.39.0](https://togithub.com/vmware/govmomi/compare/v0.38.0...v0.39.0) > Release Date: 2024-07-22 ##### 🐞 Fix - \[[`1bc3a4a`](https://togithub.com/vmware/govmomi/commit/1bc3a4a4)] handle base types by default in mo.LoadObjectContent ##### 💫 API Changes - \[[`5c0af37`](https://togithub.com/vmware/govmomi/commit/5c0af375)] use CheckTestType in compat and provisioning checkers - \[[`2e77836`](https://togithub.com/vmware/govmomi/commit/2e77836c)] add sata controller - \[[`bdb034e`](https://togithub.com/vmware/govmomi/commit/bdb034ee)] Exporting Unit field in MetricSeries struct for external use ([#​3494](https://togithub.com/vmware/govmomi/issues/3494)) - \[[`78f07c6`](https://togithub.com/vmware/govmomi/commit/78f07c63)] Add simulator test for GetVirtualDiskInfoByUUID - \[[`2d16e19`](https://togithub.com/vmware/govmomi/commit/2d16e19f)] GetVirtualDiskInfoByUUID for getting capacity/size info - \[[`29b1bce`](https://togithub.com/vmware/govmomi/commit/29b1bce9)] change CoresPerNumaNode to a pointer type - \[[`3139de3`](https://togithub.com/vmware/govmomi/commit/3139de32)] Add a method for extending VMDK - \[[`6096c0d`](https://togithub.com/vmware/govmomi/commit/6096c0d4)] add ResolveLibraryItemStorage ##### 💫 `govc` (CLI) - \[[`04fe4c2`](https://togithub.com/vmware/govmomi/commit/04fe4c26)] add vm.check commands - \[[`976bca3`](https://togithub.com/vmware/govmomi/commit/976bca3b)] add '-spec' flag to vm clone, migrate and create commands - \[[`d92015c`](https://togithub.com/vmware/govmomi/commit/d92015c4)] add vm.migrate -net flag ##### 💫 `vcsim` (Simulator) - \[[`eb2e1ea`](https://togithub.com/vmware/govmomi/commit/eb2e1ea1)] add VmCompatibilityChecker and VmProvisioningChecker - \[[`a463e54`](https://togithub.com/vmware/govmomi/commit/a463e543)] Add support for DRS automation levels ([#​3485](https://togithub.com/vmware/govmomi/issues/3485)) - \[[`f7a85a8`](https://togithub.com/vmware/govmomi/commit/f7a85a81)] Re-enable TenantManager ##### 🧹 Chore - \[[`590c92b`](https://togithub.com/vmware/govmomi/commit/590c92b1)] Update version.go for v0.39.0 - \[[`4434e26`](https://togithub.com/vmware/govmomi/commit/4434e26b)] bump go version - \[[`d7e2709`](https://togithub.com/vmware/govmomi/commit/d7e27099)] fix codeql ([#​3492](https://togithub.com/vmware/govmomi/issues/3492)) ([#​3492](https://togithub.com/vmware/govmomi/issues/3492)) - \[[`fb6e597`](https://togithub.com/vmware/govmomi/commit/fb6e5977)] fix codeql ##### ⚠️ BREAKING ##### 📖 Commits - \[[`590c92b`](https://togithub.com/vmware/govmomi/commit/590c92b1)] chore: Update version.go for v0.39.0 - \[[`5c0af37`](https://togithub.com/vmware/govmomi/commit/5c0af375)] api: use CheckTestType in compat and provisioning checkers - \[[`2e77836`](https://togithub.com/vmware/govmomi/commit/2e77836c)] api: add sata controller - \[[`bdb034e`](https://togithub.com/vmware/govmomi/commit/bdb034ee)] api: Exporting Unit field in MetricSeries struct for external use ([#​3494](https://togithub.com/vmware/govmomi/issues/3494)) - \[[`4434e26`](https://togithub.com/vmware/govmomi/commit/4434e26b)] chore: bump go version - \[[`04fe4c2`](https://togithub.com/vmware/govmomi/commit/04fe4c26)] govc: add vm.check commands - \[[`976bca3`](https://togithub.com/vmware/govmomi/commit/976bca3b)] govc: add '-spec' flag to vm clone, migrate and create commands - \[[`d92015c`](https://togithub.com/vmware/govmomi/commit/d92015c4)] govc: add vm.migrate -net flag - \[[`eb2e1ea`](https://togithub.com/vmware/govmomi/commit/eb2e1ea1)] vcsim: add VmCompatibilityChecker and VmProvisioningChecker - \[[`12467b0`](https://togithub.com/vmware/govmomi/commit/12467b00)] refactor: make importing templates available as a lib - \[[`d7e2709`](https://togithub.com/vmware/govmomi/commit/d7e27099)] chore: fix codeql ([#​3492](https://togithub.com/vmware/govmomi/issues/3492)) ([#​3492](https://togithub.com/vmware/govmomi/issues/3492)) - \[[`fb6e597`](https://togithub.com/vmware/govmomi/commit/fb6e5977)] chore: fix codeql - \[[`a463e54`](https://togithub.com/vmware/govmomi/commit/a463e543)] vcsim: Add support for DRS automation levels ([#​3485](https://togithub.com/vmware/govmomi/issues/3485)) - \[[`78f07c6`](https://togithub.com/vmware/govmomi/commit/78f07c63)] api: Add simulator test for GetVirtualDiskInfoByUUID - \[[`2d16e19`](https://togithub.com/vmware/govmomi/commit/2d16e19f)] api: GetVirtualDiskInfoByUUID for getting capacity/size info - \[[`29b1bce`](https://togithub.com/vmware/govmomi/commit/29b1bce9)] api: change CoresPerNumaNode to a pointer type - \[[`3139de3`](https://togithub.com/vmware/govmomi/commit/3139de32)] api: Add a method for extending VMDK - \[[`6096c0d`](https://togithub.com/vmware/govmomi/commit/6096c0d4)] api: add ResolveLibraryItemStorage - \[[`1bc3a4a`](https://togithub.com/vmware/govmomi/commit/1bc3a4a4)] fix: handle base types by default in mo.LoadObjectContent - \[[`f7a85a8`](https://togithub.com/vmware/govmomi/commit/f7a85a81)] vcsim: Re-enable TenantManager
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- receiver/vcenterreceiver/go.mod | 2 +- receiver/vcenterreceiver/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 047f7f653844..73ea2f09173e 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -742,7 +742,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e // indirect - github.com/vmware/govmomi v0.38.0 // indirect + github.com/vmware/govmomi v0.39.0 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/x448/float16 v0.8.4 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index fcc864a6f350..4bf531fbfa56 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -2275,8 +2275,8 @@ github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vb github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e h1:Vu41Q0Pv3yMdd+tcDW6QeEUIK2L+9ZrPrq8NAMrKSLc= github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aRq5pxwgdJpAuP97SCjX1+Db32z/b0dggQ07FDF+fqE= -github.com/vmware/govmomi v0.38.0 h1:UvQpLAOjDpO0JUxoPCXnEzOlEa/9kejO6K58qOFr6cM= -github.com/vmware/govmomi v0.38.0/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= +github.com/vmware/govmomi v0.39.0 h1:soLZ08Q2zvjRSinNup8xVlw0KDDCJPPA1rIDmBhi7As= +github.com/vmware/govmomi v0.39.0/go.mod h1:oHzAQ1r6152zYDGcUqeK+EO8LhKo5wjtvWZBGHws2Hc= github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc= diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index 489339218fbd..ac6dfcf9ef94 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.105.0 github.com/stretchr/testify v1.9.0 - github.com/vmware/govmomi v0.38.0 + github.com/vmware/govmomi v0.39.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/config/configopaque v1.12.1-0.20240716231837-5753a58f712b go.opentelemetry.io/collector/config/configtls v1.12.1-0.20240716231837-5753a58f712b diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index 30bae2be1869..15b52ba1e098 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -144,8 +144,8 @@ github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFA github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= -github.com/vmware/govmomi v0.38.0 h1:UvQpLAOjDpO0JUxoPCXnEzOlEa/9kejO6K58qOFr6cM= -github.com/vmware/govmomi v0.38.0/go.mod h1:mtGWtM+YhTADHlCgJBiskSRPOZRsN9MSjPzaZLte/oQ= +github.com/vmware/govmomi v0.39.0 h1:soLZ08Q2zvjRSinNup8xVlw0KDDCJPPA1rIDmBhi7As= +github.com/vmware/govmomi v0.39.0/go.mod h1:oHzAQ1r6152zYDGcUqeK+EO8LhKo5wjtvWZBGHws2Hc= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= From 13366ccf10aa1bb6a86a976245c96c326e72a2e9 Mon Sep 17 00:00:00 2001 From: Aleksandr Maus Date: Tue, 23 Jul 2024 15:15:24 -0400 Subject: [PATCH 13/30] [exporter/elasticsearch] OTel mode serialization (#33290) **Description:** Implements OTel (OpenTelemetry-native) mode serialization for elasticsearch exporter. This is an initial cut in order to get the discussion going. This is approach was tested as internal POC. It leverages Elasticsearch ```"passthrough"``` fields mapping initially introduced in Elasticsearch 8.13 allowing users to query the document/scope/resources attributes as top level fields, making the ECS queries compatible with OTel sematic convention schema. Another benefit is the simplicity of conversion of stored document from Elasticsearch back to Otel data model format. The document/scope/resources attributes are dynamically mapped and stored as flattened keys. Here is an example of index template mappings with ```"passthrough"``` fields: ``` PUT _index_template/logs_otel { "priority": 250, "template": { "settings": { "index": { "lifecycle": { "name": "logs" }, "codec": "best_compression", "mapping": { "ignore_malformed": "true" } } }, "mappings": { "_source": { "enabled": true }, "date_detection": false, "dynamic": "strict", "dynamic_templates": [ { "all_strings_to_keywords": { "mapping": { "ignore_above": 1024, "type": "keyword" }, "match_mapping_type": "string" } }, { "complex_attributes": { "path_match": [ "resource.attributes.*", "scope.attributes.*", "attributes.*" ], "match_mapping_type": "object", "mapping": { "type": "flattened" } } } ], "properties": { "@timestamp": { "type": "date_nanos", "ignore_malformed": false }, "data_stream": { "type": "object", "properties": { "type": { "type": "constant_keyword" }, "dataset": { "type": "constant_keyword" }, "namespace": { "type": "constant_keyword" } } }, "observed_timestamp": { "type": "date_nanos", "ignore_malformed": true }, "severity_number": { "type": "long" }, "severity_text": { "type": "keyword" }, "body_text": { "type": "match_only_text" }, "body_structured": { "type": "flattened" }, "attributes": { "type": "passthrough", "dynamic": true, "priority": 2 }, "dropped_attributes_count": { "type": "long" }, "trace_flags": { "type": "byte" }, "trace_id": { "type": "keyword" }, "span_id": { "type": "keyword" }, "scope": { "properties": { "name": { "type": "keyword" }, "version": { "type": "keyword" }, "attributes": { "type": "passthrough", "dynamic": true, "priority": 1 }, "dropped_attributes_count": { "type": "long" }, "schema_url": { "type": "keyword" } } }, "resource": { "properties": { "dropped_attributes_count": { "type": "long" }, "schema_url": { "type": "keyword" }, "attributes": { "type": "passthrough", "dynamic": true, "priority": 0 } } } } } }, "index_patterns": [ "logs-*.otel-*" ], "data_stream": {} } ``` Here is an example of the auditd document in Elasticsearch abbreviated: ``` { "@timestamp": "2024-05-29T13:30:25.085926000Z", "attributes": { "foo": "bar", "some.bool": true }, "body_structured": { "MESSAGE": "AVC apparmor=\"STATUS\" operation=\"profile_replace\" info=\"same as current profile, skipping\" profile=\"unconfined\" name=\"/usr/bin/evince-previewer\" pid=2702 comm=\"apparmor_parser\"", "SYSLOG_FACILITY": "4", "SYSLOG_IDENTIFIER": "audit", "_SOURCE_REALTIME_TIMESTAMP": "1716989425080000", "_TRANSPORT": "audit", }, "dropped_attributes_count": 0, "observed_timestamp": "2024-05-29T14:49:26.534908898Z", "resource": { "attributes": { "data_stream.dataset": "auditd.otel", "data_stream.namespace": "default", "data_stream.type": "logs", "host.arch": "arm64", "host.cpu.cache.l2.size": 0, "host.cpu.family": "", "host.cpu.model.id": "0x000", "host.cpu.model.name": "", "host.cpu.stepping": "0", "host.cpu.vendor.id": "Apple", "host.id": "cae0e0147d454a80971b0b747c8b62b9", "host.ip": [ "172.16.3.131", "fe80::20c:29ff:fe66:3012", "host.name": "lebuntu", "host.os.description": "Ubuntu 22.04.4 LTS (Jammy Jellyfish) (Linux lebuntu 5.15.0-107-generic #117-Ubuntu SMP Mon Apr 29 14:37:09 UTC 2024 aarch64)", "host.os.type": "linux", "os.description": "Ubuntu 22.04.4 LTS (Jammy Jellyfish) (Linux lebuntu 5.15.0-107-generic #117-Ubuntu SMP Mon Apr 29 14:37:09 UTC 2024 aarch64)", "os.type": "linux" }, "dropped_attributes_count": 0, "schema_url": "https://opentelemetry.io/schemas/1.6.1" }, "severity_number": 0, "trace_flags": 0 } ``` Here is an example of ECS compatible query that works on this Otel native schema: ``` GET logs-auditd.otel-default/_search { "query": { "bool": { "must": [ { "match": { "host.name": "lebuntu" } } ] } } } ``` **Link to tracking Issue:** No tracking issue yet. **Testing:** Added unit test for OTel transformation. Tested with journald OTel receiver. **Documentation:** No documentation is added yet. --------- Co-authored-by: Felix Barnsteiner Co-authored-by: Carson Ip --- .../feature_elasticsearch_otel_model.yaml | 27 ++ exporter/elasticsearchexporter/README.md | 4 + exporter/elasticsearchexporter/config.go | 4 + .../data_stream_router.go | 18 +- .../data_stream_router_test.go | 78 +++++ exporter/elasticsearchexporter/exporter.go | 16 +- .../internal/objmodel/objmodel.go | 41 ++- .../internal/objmodel/objmodel_test.go | 42 ++- exporter/elasticsearchexporter/model.go | 132 ++++++- exporter/elasticsearchexporter/model_test.go | 324 +++++++++++++++++- 10 files changed, 647 insertions(+), 39 deletions(-) create mode 100644 .chloggen/feature_elasticsearch_otel_model.yaml create mode 100644 exporter/elasticsearchexporter/data_stream_router_test.go diff --git a/.chloggen/feature_elasticsearch_otel_model.yaml b/.chloggen/feature_elasticsearch_otel_model.yaml new file mode 100644 index 000000000000..443bb7a96b5e --- /dev/null +++ b/.chloggen/feature_elasticsearch_otel_model.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: elasticsearchexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Introduce an experimental OTel native mapping mode for logs + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33290] + +# (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/exporter/elasticsearchexporter/README.md b/exporter/elasticsearchexporter/README.md index eaff8a122b62..f2f9efca56e4 100644 --- a/exporter/elasticsearchexporter/README.md +++ b/exporter/elasticsearchexporter/README.md @@ -127,6 +127,10 @@ behaviours, which may be configured through the following settings: - `mode` (default=none): The fields naming mode. valid modes are: - `none`: Use original fields and event structure from the OTLP event. - `ecs`: Try to map fields to [Elastic Common Schema (ECS)][ECS] + - `otel`: Elastic's preferred "OTel-native" mapping mode. Uses original fields and event structure from the OTLP event. + :warning: This mode's behavior is unstable, it is currently is experimental and undergoing changes. + There's a special treatment for the following attributes: `data_stream.type`, `data_stream.dataset`, `data_stream.namespace`. Instead of serializing these values under the `*attributes.*` namespace, they're put at the root of the document, to conform with the conventions of the data stream naming scheme that maps these as `constant_keyword` fields. + - `raw`: Omit the `Attributes.` string prefixed to field names for log and span attributes as well as omit the `Events.` string prefixed to field names for span events. diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index e5a7b28fdbda..184610bdc6b2 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -179,6 +179,7 @@ type MappingMode int const ( MappingNone MappingMode = iota MappingECS + MappingOTel MappingRaw ) @@ -193,6 +194,8 @@ func (m MappingMode) String() string { return "" case MappingECS: return "ecs" + case MappingOTel: + return "otel" case MappingRaw: return "raw" default: @@ -205,6 +208,7 @@ var mappingModes = func() map[string]MappingMode { for _, m := range []MappingMode{ MappingNone, MappingECS, + MappingOTel, MappingRaw, } { table[strings.ToLower(m.String())] = m diff --git a/exporter/elasticsearchexporter/data_stream_router.go b/exporter/elasticsearchexporter/data_stream_router.go index b95a66a913a2..028fd183aa2d 100644 --- a/exporter/elasticsearchexporter/data_stream_router.go +++ b/exporter/elasticsearchexporter/data_stream_router.go @@ -16,12 +16,14 @@ func routeWithDefaults(defaultDSType, defaultDSDataset, defaultDSNamespace strin pcommon.Map, pcommon.Map, string, + bool, ) string { return func( recordAttr pcommon.Map, scopeAttr pcommon.Map, resourceAttr pcommon.Map, fIndex string, + otel bool, ) string { // Order: // 1. read data_stream.* from attributes @@ -37,6 +39,13 @@ func routeWithDefaults(defaultDSType, defaultDSDataset, defaultDSNamespace strin return fmt.Sprintf("%s%s%s", prefix, fIndex, suffix) } } + + // The naming convention for datastream is expected to be "logs-[dataset].otel-[namespace]". + // This is in order to match the soon to be built-in logs-*.otel-* index template. + if otel { + dataset += ".otel" + } + recordAttr.PutStr(dataStreamDataset, dataset) recordAttr.PutStr(dataStreamNamespace, namespace) recordAttr.PutStr(dataStreamType, defaultDSType) @@ -51,9 +60,10 @@ func routeLogRecord( scope pcommon.InstrumentationScope, resource pcommon.Resource, fIndex string, + otel bool, ) string { route := routeWithDefaults(defaultDataStreamTypeLogs, defaultDataStreamDataset, defaultDataStreamNamespace) - return route(record.Attributes(), scope.Attributes(), resource.Attributes(), fIndex) + return route(record.Attributes(), scope.Attributes(), resource.Attributes(), fIndex, otel) } // routeDataPoint returns the name of the index to send the data point to according to data stream routing attributes. @@ -63,9 +73,10 @@ func routeDataPoint( scope pcommon.InstrumentationScope, resource pcommon.Resource, fIndex string, + otel bool, ) string { route := routeWithDefaults(defaultDataStreamTypeMetrics, defaultDataStreamDataset, defaultDataStreamNamespace) - return route(dataPoint.Attributes(), scope.Attributes(), resource.Attributes(), fIndex) + return route(dataPoint.Attributes(), scope.Attributes(), resource.Attributes(), fIndex, otel) } // routeSpan returns the name of the index to send the span to according to data stream routing attributes. @@ -75,7 +86,8 @@ func routeSpan( scope pcommon.InstrumentationScope, resource pcommon.Resource, fIndex string, + otel bool, ) string { route := routeWithDefaults(defaultDataStreamTypeTraces, defaultDataStreamDataset, defaultDataStreamNamespace) - return route(span.Attributes(), scope.Attributes(), resource.Attributes(), fIndex) + return route(span.Attributes(), scope.Attributes(), resource.Attributes(), fIndex, otel) } diff --git a/exporter/elasticsearchexporter/data_stream_router_test.go b/exporter/elasticsearchexporter/data_stream_router_test.go new file mode 100644 index 000000000000..26b126759972 --- /dev/null +++ b/exporter/elasticsearchexporter/data_stream_router_test.go @@ -0,0 +1,78 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package elasticsearchexporter + +import ( + "fmt" + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" +) + +type routeTestInfo struct { + name string + otel bool + want string +} + +func createRouteTests(dsType string) []routeTestInfo { + renderWantRoute := func(dsType string, otel bool) string { + if otel { + return fmt.Sprintf("%s-%s.otel-%s", dsType, defaultDataStreamDataset, defaultDataStreamNamespace) + } + return fmt.Sprintf("%s-%s-%s", dsType, defaultDataStreamDataset, defaultDataStreamNamespace) + } + + return []routeTestInfo{ + { + name: "default", + otel: false, + want: renderWantRoute(dsType, false), + }, + { + name: "otel", + otel: true, + want: renderWantRoute(dsType, true), + }, + } +} + +func TestRouteLogRecord(t *testing.T) { + + tests := createRouteTests(defaultDataStreamTypeLogs) + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + ds := routeLogRecord(plog.NewLogRecord(), plog.NewScopeLogs().Scope(), plog.NewResourceLogs().Resource(), "", tc.otel) + assert.Equal(t, tc.want, ds) + }) + } +} + +func TestRouteDataPoint(t *testing.T) { + + tests := createRouteTests(defaultDataStreamTypeMetrics) + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + ds := routeDataPoint(pmetric.NewNumberDataPoint(), plog.NewScopeLogs().Scope(), plog.NewResourceLogs().Resource(), "", tc.otel) + assert.Equal(t, tc.want, ds) + }) + } +} + +func TestRouteSpan(t *testing.T) { + + tests := createRouteTests(defaultDataStreamTypeTraces) + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + ds := routeSpan(ptrace.NewSpan(), plog.NewScopeLogs().Scope(), plog.NewResourceLogs().Resource(), "", tc.otel) + assert.Equal(t, tc.want, ds) + }) + } +} diff --git a/exporter/elasticsearchexporter/exporter.go b/exporter/elasticsearchexporter/exporter.go index ade3855c2b2a..ef8e765c0e56 100644 --- a/exporter/elasticsearchexporter/exporter.go +++ b/exporter/elasticsearchexporter/exporter.go @@ -30,6 +30,7 @@ type elasticsearchExporter struct { logstashFormat LogstashFormatSettings dynamicIndex bool model mappingModel + otel bool bulkIndexer bulkIndexer } @@ -49,6 +50,8 @@ func newExporter( mode: cfg.MappingMode(), } + otel := model.mode == MappingOTel + userAgent := fmt.Sprintf( "%s/%s (%s/%s)", set.BuildInfo.Description, @@ -66,6 +69,7 @@ func newExporter( dynamicIndex: dynamicIndex, model: model, logstashFormat: cfg.LogstashFormat, + otel: otel, }, nil } @@ -107,7 +111,7 @@ func (e *elasticsearchExporter) pushLogsData(ctx context.Context, ld plog.Logs) scope := ill.Scope() logs := ill.LogRecords() for k := 0; k < logs.Len(); k++ { - if err := e.pushLogRecord(ctx, resource, logs.At(k), scope, session); err != nil { + if err := e.pushLogRecord(ctx, resource, rl.SchemaUrl(), logs.At(k), scope, ill.SchemaUrl(), session); err != nil { if cerr := ctx.Err(); cerr != nil { return cerr } @@ -130,13 +134,15 @@ func (e *elasticsearchExporter) pushLogsData(ctx context.Context, ld plog.Logs) func (e *elasticsearchExporter) pushLogRecord( ctx context.Context, resource pcommon.Resource, + resourceSchemaURL string, record plog.LogRecord, scope pcommon.InstrumentationScope, + scopeSchemaURL string, bulkIndexerSession bulkIndexerSession, ) error { fIndex := e.index if e.dynamicIndex { - fIndex = routeLogRecord(record, scope, resource, fIndex) + fIndex = routeLogRecord(record, scope, resource, fIndex, e.otel) } if e.logstashFormat.Enabled { @@ -147,7 +153,7 @@ func (e *elasticsearchExporter) pushLogRecord( fIndex = formattedIndex } - document, err := e.model.encodeLog(resource, record, scope) + document, err := e.model.encodeLog(resource, resourceSchemaURL, record, scope, scopeSchemaURL) if err != nil { return fmt.Errorf("failed to encode log event: %w", err) } @@ -279,7 +285,7 @@ func (e *elasticsearchExporter) getMetricDataPointIndex( ) (string, error) { fIndex := e.index if e.dynamicIndex { - fIndex = routeDataPoint(dataPoint, scope, resource, fIndex) + fIndex = routeDataPoint(dataPoint, scope, resource, fIndex, e.otel) } if e.logstashFormat.Enabled { @@ -342,7 +348,7 @@ func (e *elasticsearchExporter) pushTraceRecord( ) error { fIndex := e.index if e.dynamicIndex { - fIndex = routeSpan(span, scope, resource, fIndex) + fIndex = routeSpan(span, scope, resource, fIndex, e.otel) } if e.logstashFormat.Enabled { diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go index 120e78608558..dda38a0fe84c 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel.go @@ -244,19 +244,19 @@ func (doc *Document) Dedup() { // Serialize writes the document to the given writer. The serializer will create nested objects if dedot is true. // // NOTE: The documented MUST be sorted if dedot is true. -func (doc *Document) Serialize(w io.Writer, dedot bool) error { +func (doc *Document) Serialize(w io.Writer, dedot bool, otel bool) error { v := json.NewVisitor(w) - return doc.iterJSON(v, dedot) + return doc.iterJSON(v, dedot, otel) } -func (doc *Document) iterJSON(v *json.Visitor, dedot bool) error { +func (doc *Document) iterJSON(v *json.Visitor, dedot bool, otel bool) error { if dedot { - return doc.iterJSONDedot(v) + return doc.iterJSONDedot(v, otel) } - return doc.iterJSONFlat(v) + return doc.iterJSONFlat(v, otel) } -func (doc *Document) iterJSONFlat(w *json.Visitor) error { +func (doc *Document) iterJSONFlat(w *json.Visitor, otel bool) error { err := w.OnObjectStart(-1, structform.AnyType) if err != nil { return err @@ -275,7 +275,7 @@ func (doc *Document) iterJSONFlat(w *json.Visitor) error { return err } - if err := fld.value.iterJSON(w, true); err != nil { + if err := fld.value.iterJSON(w, true, otel); err != nil { return err } } @@ -283,7 +283,14 @@ func (doc *Document) iterJSONFlat(w *json.Visitor) error { return nil } -func (doc *Document) iterJSONDedot(w *json.Visitor) error { +// Set of prefixes for the OTel attributes that needs to stay flattened +var otelPrefixSet = map[string]struct{}{ + "attributes.": {}, + "resource.attributes.": {}, + "scope.attributes.": {}, +} + +func (doc *Document) iterJSONDedot(w *json.Visitor, otel bool) error { objPrefix := "" level := 0 @@ -335,6 +342,16 @@ func (doc *Document) iterJSONDedot(w *json.Visitor) error { // increase object level up to current field for { + + // Otel mode serialization + if otel { + // Check the prefix + _, isOtelPrefix := otelPrefixSet[objPrefix] + if isOtelPrefix { + break + } + } + start := len(objPrefix) idx := strings.IndexByte(key[start:], '.') if idx < 0 { @@ -357,7 +374,7 @@ func (doc *Document) iterJSONDedot(w *json.Visitor) error { if err := w.OnKey(fieldName); err != nil { return err } - if err := fld.value.iterJSON(w, true); err != nil { + if err := fld.value.iterJSON(w, true, otel); err != nil { return err } } @@ -460,7 +477,7 @@ func (v *Value) IsEmpty() bool { } } -func (v *Value) iterJSON(w *json.Visitor, dedot bool) error { +func (v *Value) iterJSON(w *json.Visitor, dedot bool, otel bool) error { switch v.kind { case KindNil: return w.OnNil() @@ -483,13 +500,13 @@ func (v *Value) iterJSON(w *json.Visitor, dedot bool) error { if len(v.doc.fields) == 0 { return w.OnNil() } - return v.doc.iterJSON(w, dedot) + return v.doc.iterJSON(w, dedot, otel) case KindArr: if err := w.OnArrayStart(-1, structform.AnyType); err != nil { return err } for i := range v.arr { - if err := v.arr[i].iterJSON(w, dedot); err != nil { + if err := v.arr[i].iterJSON(w, dedot, otel); err != nil { return err } } diff --git a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go index ab22115cf30f..e67dfa43cf56 100644 --- a/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go +++ b/exporter/elasticsearchexporter/internal/objmodel/objmodel_test.go @@ -284,7 +284,7 @@ func TestDocument_Serialize_Flat(t *testing.T) { assert.NoError(t, m.FromRaw(test.attrs)) doc := DocumentFromAttributes(m) doc.Dedup() - err := doc.Serialize(&buf, false) + err := doc.Serialize(&buf, false, false) require.NoError(t, err) assert.Equal(t, test.want, buf.String()) @@ -345,7 +345,7 @@ func TestDocument_Serialize_Dedot(t *testing.T) { assert.NoError(t, m.FromRaw(test.attrs)) doc := DocumentFromAttributes(m) doc.Dedup() - err := doc.Serialize(&buf, true) + err := doc.Serialize(&buf, true, false) require.NoError(t, err) assert.Equal(t, test.want, buf.String()) @@ -353,6 +353,42 @@ func TestDocument_Serialize_Dedot(t *testing.T) { } } +func TestDocument_Serialize_Otel(t *testing.T) { + tests := map[string]struct { + attrs map[string]any + want string + }{ + "otel": { + attrs: map[string]any{ + "@timestamp": "2024-03-18T21:09:53.645578000Z", + "attributes.auditd.log.op": "PAM:session_open", + "attributes.auditd.log.record_type": "USER_START", + "attributes.auditd.log.sequence": 6082, + "attributes.auditd.log.subj": "unconfined", + "attributes.auditd.log.uid": "1000", + "scope.attributes.bar.one": "boo", + "scope.attributes.foo.two": "bar", + "resource.attributes.blah.num": 234, + "resource.attributes.blah.str": "something", + }, + want: `{"@timestamp":"2024-03-18T21:09:53.645578000Z","attributes":{"auditd.log.op":"PAM:session_open","auditd.log.record_type":"USER_START","auditd.log.sequence":6082,"auditd.log.subj":"unconfined","auditd.log.uid":"1000"},"resource":{"attributes":{"blah.num":234,"blah.str":"something"}},"scope":{"attributes":{"bar.one":"boo","foo.two":"bar"}}}`, + }, + } + + for name, test := range tests { + t.Run(name, func(t *testing.T) { + var buf strings.Builder + m := pcommon.NewMap() + assert.NoError(t, m.FromRaw(test.attrs)) + doc := DocumentFromAttributes(m) + doc.Dedup() // Call Dedup for predictable order + err := doc.Serialize(&buf, true, true) + require.NoError(t, err) + assert.Equal(t, test.want, buf.String()) + }) + } +} + func TestValue_Serialize(t *testing.T) { tests := map[string]struct { value Value @@ -391,7 +427,7 @@ func TestValue_Serialize(t *testing.T) { for name, test := range tests { t.Run(name, func(t *testing.T) { var buf strings.Builder - err := test.value.iterJSON(json.NewVisitor(&buf), false) + err := test.value.iterJSON(json.NewVisitor(&buf), false, false) require.NoError(t, err) assert.Equal(t, test.want, buf.String()) }) diff --git a/exporter/elasticsearchexporter/model.go b/exporter/elasticsearchexporter/model.go index bb6ed0ffada1..3eb7ee934b10 100644 --- a/exporter/elasticsearchexporter/model.go +++ b/exporter/elasticsearchexporter/model.go @@ -64,7 +64,7 @@ var resourceAttrsToPreserve = map[string]bool{ } type mappingModel interface { - encodeLog(pcommon.Resource, plog.LogRecord, pcommon.InstrumentationScope) ([]byte, error) + encodeLog(pcommon.Resource, string, plog.LogRecord, pcommon.InstrumentationScope, string) ([]byte, error) encodeSpan(pcommon.Resource, ptrace.Span, pcommon.InstrumentationScope) ([]byte, error) upsertMetricDataPointValue(map[uint32]objmodel.Document, pcommon.Resource, pcommon.InstrumentationScope, pmetric.Metric, dataPoint, pcommon.Value) error encodeDocument(objmodel.Document) ([]byte, error) @@ -92,18 +92,20 @@ const ( attributeField = "attribute" ) -func (m *encodeModel) encodeLog(resource pcommon.Resource, record plog.LogRecord, scope pcommon.InstrumentationScope) ([]byte, error) { +func (m *encodeModel) encodeLog(resource pcommon.Resource, resourceSchemaURL string, record plog.LogRecord, scope pcommon.InstrumentationScope, scopeSchemaURL string) ([]byte, error) { var document objmodel.Document switch m.mode { case MappingECS: document = m.encodeLogECSMode(resource, record, scope) + case MappingOTel: + document = m.encodeLogOTelMode(resource, resourceSchemaURL, record, scope, scopeSchemaURL) default: document = m.encodeLogDefaultMode(resource, record, scope) } document.Dedup() var buf bytes.Buffer - err := document.Serialize(&buf, m.dedot) + err := document.Serialize(&buf, m.dedot, m.mode == MappingOTel) return buf.Bytes(), err } @@ -126,7 +128,126 @@ func (m *encodeModel) encodeLogDefaultMode(resource pcommon.Resource, record plo document.AddAttributes("Scope", scopeToAttributes(scope)) return document +} + +var datastreamKeys = []string{dataStreamType, dataStreamDataset, dataStreamNamespace} + +func (m *encodeModel) encodeLogOTelMode(resource pcommon.Resource, resourceSchemaURL string, record plog.LogRecord, scope pcommon.InstrumentationScope, scopeSchemaURL string) objmodel.Document { + var document objmodel.Document + + docTimeStamp := record.Timestamp() + if docTimeStamp.AsTime().UnixNano() == 0 { + docTimeStamp = record.ObservedTimestamp() + } + + document.AddTimestamp("@timestamp", docTimeStamp) + document.AddTimestamp("observed_timestamp", record.ObservedTimestamp()) + + document.AddTraceID("trace_id", record.TraceID()) + document.AddSpanID("span_id", record.SpanID()) + document.AddInt("trace_flags", int64(record.Flags())) + document.AddString("severity_text", record.SeverityText()) + document.AddInt("severity_number", int64(record.SeverityNumber())) + document.AddInt("dropped_attributes_count", int64(record.DroppedAttributesCount())) + + // At this point the data_stream attributes are expected to be in the record attributes, + // updated by the router. + // Move them to the top of the document and remove them from the record + attributeMap := record.Attributes() + + forEachDataStreamKey := func(fn func(key string)) { + for _, key := range datastreamKeys { + fn(key) + } + } + + forEachDataStreamKey(func(key string) { + if value, exists := attributeMap.Get(key); exists { + document.AddAttribute(key, value) + attributeMap.Remove(key) + } + }) + + document.AddAttributes("attributes", attributeMap) + + // Resource + resourceMapVal := pcommon.NewValueMap() + resourceMap := resourceMapVal.Map() + resourceMap.PutStr("schema_url", resourceSchemaURL) + resourceMap.PutInt("dropped_attributes_count", int64(resource.DroppedAttributesCount())) + resourceAttrMap := resourceMap.PutEmptyMap("attributes") + + resource.Attributes().CopyTo(resourceAttrMap) + + // Remove data_stream attributes from the resources attributes if present + forEachDataStreamKey(func(key string) { + resourceAttrMap.Remove(key) + }) + document.Add("resource", objmodel.ValueFromAttribute(resourceMapVal)) + + // Scope + scopeMapVal := pcommon.NewValueMap() + scopeMap := scopeMapVal.Map() + if scope.Name() != "" { + scopeMap.PutStr("name", scope.Name()) + } + if scope.Version() != "" { + scopeMap.PutStr("version", scope.Version()) + } + if scopeSchemaURL != "" { + scopeMap.PutStr("schema_url", scopeSchemaURL) + } + if scope.DroppedAttributesCount() > 0 { + scopeMap.PutInt("dropped_attributes_count", int64(scope.DroppedAttributesCount())) + } + scopeAttributes := scope.Attributes() + if scopeAttributes.Len() > 0 { + scopeAttrMap := scopeMap.PutEmptyMap("attributes") + scopeAttributes.CopyTo(scopeAttrMap) + + // Remove data_stream attributes from the scope attributes if present + forEachDataStreamKey(func(key string) { + scopeAttrMap.Remove(key) + }) + } + + if scopeMap.Len() > 0 { + document.Add("scope", objmodel.ValueFromAttribute(scopeMapVal)) + } + + // Body + setOTelLogBody(&document, record.Body()) + + return document +} + +func setOTelLogBody(doc *objmodel.Document, body pcommon.Value) { + switch body.Type() { + case pcommon.ValueTypeMap: + doc.AddAttribute("body_structured", body) + case pcommon.ValueTypeSlice: + slice := body.Slice() + for i := 0; i < slice.Len(); i++ { + switch slice.At(i).Type() { + case pcommon.ValueTypeMap, pcommon.ValueTypeSlice: + doc.AddAttribute("body_structured", body) + return + } + } + + bodyTextVal := pcommon.NewValueSlice() + bodyTextSlice := bodyTextVal.Slice() + bodyTextSlice.EnsureCapacity(slice.Len()) + + for i := 0; i < slice.Len(); i++ { + elem := slice.At(i) + bodyTextSlice.AppendEmpty().SetStr(elem.AsString()) + } + doc.AddAttribute("body_text", bodyTextVal) + default: + doc.AddString("body_text", body.AsString()) + } } func (m *encodeModel) encodeLogECSMode(resource pcommon.Resource, record plog.LogRecord, scope pcommon.InstrumentationScope) objmodel.Document { @@ -175,7 +296,7 @@ func (m *encodeModel) encodeDocument(document objmodel.Document) ([]byte, error) document.Dedup() var buf bytes.Buffer - err := document.Serialize(&buf, m.dedot) + err := document.Serialize(&buf, m.dedot, m.mode == MappingOTel) if err != nil { return nil, err } @@ -284,7 +405,8 @@ func (m *encodeModel) encodeSpan(resource pcommon.Resource, span ptrace.Span, sc document.Dedup() var buf bytes.Buffer - err := document.Serialize(&buf, m.dedot) + // OTel serialization is not supported for traces yet + err := document.Serialize(&buf, m.dedot, false) return buf.Bytes(), err } diff --git a/exporter/elasticsearchexporter/model_test.go b/exporter/elasticsearchexporter/model_test.go index ee59e80fe0ce..f4e24a209698 100644 --- a/exporter/elasticsearchexporter/model_test.go +++ b/exporter/elasticsearchexporter/model_test.go @@ -5,6 +5,8 @@ package elasticsearchexporter import ( "bytes" + "encoding/hex" + "encoding/json" "fmt" "os" "sort" @@ -62,7 +64,7 @@ func TestEncodeLog(t *testing.T) { model := &encodeModel{dedot: false} td := mockResourceLogs() td.ScopeLogs().At(0).LogRecords().At(0).SetObservedTimestamp(pcommon.NewTimestampFromTime(time.Date(2023, 4, 19, 3, 4, 5, 6, time.UTC))) - logByte, err := model.encodeLog(td.Resource(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope()) + logByte, err := model.encodeLog(td.Resource(), td.SchemaUrl(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope(), td.ScopeLogs().At(0).SchemaUrl()) assert.NoError(t, err) assert.Equal(t, expectedLogBody, string(logByte)) }) @@ -70,7 +72,7 @@ func TestEncodeLog(t *testing.T) { t.Run("both timestamp and observedTimestamp empty", func(t *testing.T) { model := &encodeModel{dedot: false} td := mockResourceLogs() - logByte, err := model.encodeLog(td.Resource(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope()) + logByte, err := model.encodeLog(td.Resource(), td.SchemaUrl(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope(), td.ScopeLogs().At(0).SchemaUrl()) assert.NoError(t, err) assert.Equal(t, expectedLogBodyWithEmptyTimestamp, string(logByte)) }) @@ -79,7 +81,7 @@ func TestEncodeLog(t *testing.T) { model := &encodeModel{dedot: true} td := mockResourceLogs() td.Resource().Attributes().PutStr("foo.bar", "baz") - logByte, err := model.encodeLog(td.Resource(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope()) + logByte, err := model.encodeLog(td.Resource(), td.SchemaUrl(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope(), td.ScopeLogs().At(0).SchemaUrl()) require.NoError(t, err) require.Equal(t, expectedLogBodyDeDottedWithEmptyTimestamp, string(logByte)) }) @@ -331,7 +333,7 @@ func TestEncodeLogECSModeDuplication(t *testing.T) { mode: MappingECS, dedot: true, } - doc, err := m.encodeLog(resource, record, scope) + doc, err := m.encodeLog(resource, "", record, scope, "") require.NoError(t, err) assert.Equal(t, want, string(doc)) @@ -398,7 +400,7 @@ func TestEncodeLogECSMode(t *testing.T) { var buf bytes.Buffer m := encodeModel{} doc := m.encodeLogECSMode(resource, record, scope) - require.NoError(t, doc.Serialize(&buf, false)) + require.NoError(t, doc.Serialize(&buf, false, false)) require.JSONEq(t, `{ "@timestamp": "2024-03-12T20:00:41.123456789Z", @@ -522,7 +524,7 @@ func TestEncodeLogECSModeAgentName(t *testing.T) { var buf bytes.Buffer m := encodeModel{} doc := m.encodeLogECSMode(resource, record, scope) - require.NoError(t, doc.Serialize(&buf, false)) + require.NoError(t, doc.Serialize(&buf, false, false)) require.JSONEq(t, fmt.Sprintf(`{ "@timestamp": "2024-03-13T23:50:59.123456789Z", "agent.name": %q @@ -574,7 +576,7 @@ func TestEncodeLogECSModeAgentVersion(t *testing.T) { var buf bytes.Buffer m := encodeModel{} doc := m.encodeLogECSMode(resource, record, scope) - require.NoError(t, doc.Serialize(&buf, false)) + require.NoError(t, doc.Serialize(&buf, false, false)) if test.expectedAgentVersion == "" { require.JSONEq(t, `{ @@ -681,7 +683,7 @@ func TestEncodeLogECSModeHostOSType(t *testing.T) { var buf bytes.Buffer m := encodeModel{} doc := m.encodeLogECSMode(resource, record, scope) - require.NoError(t, doc.Serialize(&buf, false)) + require.NoError(t, doc.Serialize(&buf, false, false)) expectedJSON := `{"@timestamp":"2024-03-13T23:50:59.123456789Z", "agent.name":"otlp"` if test.expectedHostOsName != "" { @@ -732,7 +734,7 @@ func TestEncodeLogECSModeTimestamps(t *testing.T) { var buf bytes.Buffer m := encodeModel{} doc := m.encodeLogECSMode(resource, record, scope) - require.NoError(t, doc.Serialize(&buf, false)) + require.NoError(t, doc.Serialize(&buf, false, false)) require.JSONEq(t, fmt.Sprintf( `{"@timestamp":%q,"agent.name":"otlp"}`, test.expectedTimestamp, @@ -882,6 +884,306 @@ func TestMapLogAttributesToECS(t *testing.T) { } } +// JSON serializable structs for OTel test convenience +type OTelRecord struct { + TraceID OTelTraceID `json:"trace_id"` + SpanID OTelSpanID `json:"span_id"` + Timestamp time.Time `json:"@timestamp"` + ObservedTimestamp time.Time `json:"observed_timestamp"` + TraceFlags uint32 `json:"trace_flags"` + SeverityNumber int32 `json:"severity_number"` + SeverityText string `json:"severity_text"` + Attributes map[string]any `json:"attributes"` + DroppedAttributesCount uint32 `json:"dropped_attrbutes_count"` + Scope OTelScope `json:"scope"` + Resource OTelResource `json:"resource"` + Datastream OTelRecordDatastream `json:"data_stream"` +} + +type OTelRecordDatastream struct { + Dataset string `json:"dataset"` + Namespace string `json:"namespace"` + Type string `json:"type"` +} + +type OTelScope struct { + Name string `json:"name"` + Version string `json:"version"` + Attributes map[string]any `json:"attributes"` + DroppedAttributesCount uint32 `json:"dropped_attrbutes_count"` + Schema string `json:"schema"` +} + +type OTelResource struct { + Attributes map[string]any `json:"attributes"` + DroppedAttributesCount uint32 `json:"dropped_attrbutes_count"` + Schema string `json:"schema"` +} + +type OTelSpanID pcommon.SpanID + +func (o OTelSpanID) MarshalJSON() ([]byte, error) { + return nil, nil +} + +func (o *OTelSpanID) UnmarshalJSON(data []byte) error { + b, err := decodeOTelID(data) + if err != nil { + return err + } + copy(o[:], b) + return nil +} + +type OTelTraceID pcommon.TraceID + +func (o OTelTraceID) MarshalJSON() ([]byte, error) { + return nil, nil +} + +func (o *OTelTraceID) UnmarshalJSON(data []byte) error { + b, err := decodeOTelID(data) + if err != nil { + return err + } + copy(o[:], b) + return nil +} + +func decodeOTelID(data []byte) ([]byte, error) { + var s string + if err := json.Unmarshal(data, &s); err != nil { + return nil, err + } + + return hex.DecodeString(s) +} + +func TestEncodeLogOtelMode(t *testing.T) { + + tests := []struct { + name string + rec OTelRecord + wantFn func(OTelRecord) OTelRecord // Allows each test to customized the expectations from the original test record data + }{ + { + name: "default", // Expecting default data_stream values + rec: buildOTelRecordTestData(t, nil), + wantFn: func(or OTelRecord) OTelRecord { + return assignDatastreamData(or) + }, + }, + { + name: "custom dataset", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Attributes["data_stream.dataset"] = "custom" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + // Datastream attributes are expected to be deleted from under the attributes + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "custom.otel") + }, + }, + { + name: "custom dataset with otel suffix", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Attributes["data_stream.dataset"] = "custom.otel" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "custom.otel.otel") + }, + }, + { + name: "custom dataset/namespace", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Attributes["data_stream.dataset"] = "customds" + or.Attributes["data_stream.namespace"] = "customns" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "customds.otel", "customns") + }, + }, + { + name: "dataset attributes priority", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Attributes["data_stream.dataset"] = "first" + or.Scope.Attributes["data_stream.dataset"] = "second" + or.Resource.Attributes["data_stream.dataset"] = "third" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "first.otel") + }, + }, + { + name: "dataset scope attribute priority", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Scope.Attributes["data_stream.dataset"] = "second" + or.Resource.Attributes["data_stream.dataset"] = "third" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "second.otel") + }, + }, + { + name: "dataset resource attribute priority", + rec: buildOTelRecordTestData(t, func(or OTelRecord) OTelRecord { + or.Resource.Attributes["data_stream.dataset"] = "third" + return or + }), + wantFn: func(or OTelRecord) OTelRecord { + deleteDatasetAttributes(or) + return assignDatastreamData(or, "", "third.otel") + }, + }, + } + + m := encodeModel{ + dedot: true, // default + mode: MappingOTel, + } + + for _, tc := range tests { + record, scope, resource := createTestOTelLogRecord(t, tc.rec) + + // This sets the data_stream values default or derived from the record/scope/resources + routeLogRecord(record, scope, resource, "", true) + + b, err := m.encodeLog(resource, tc.rec.Resource.Schema, record, scope, tc.rec.Scope.Schema) + require.NoError(t, err) + + want := tc.rec + if tc.wantFn != nil { + want = tc.wantFn(want) + } + + var got OTelRecord + err = json.Unmarshal(b, &got) + + require.NoError(t, err) + + assert.Equal(t, want, got) + } +} + +// helper function that creates the OTel LogRecord from the test structure +func createTestOTelLogRecord(t *testing.T, rec OTelRecord) (plog.LogRecord, pcommon.InstrumentationScope, pcommon.Resource) { + record := plog.NewLogRecord() + record.SetTimestamp(pcommon.Timestamp(uint64(rec.Timestamp.UnixNano()))) + record.SetObservedTimestamp(pcommon.Timestamp(uint64(rec.ObservedTimestamp.UnixNano()))) + + record.SetTraceID(pcommon.TraceID(rec.TraceID)) + record.SetSpanID(pcommon.SpanID(rec.SpanID)) + record.SetFlags(plog.LogRecordFlags(rec.TraceFlags)) + record.SetSeverityNumber(plog.SeverityNumber(rec.SeverityNumber)) + record.SetSeverityText(rec.SeverityText) + record.SetDroppedAttributesCount(rec.DroppedAttributesCount) + + err := record.Attributes().FromRaw(rec.Attributes) + require.NoError(t, err) + + scope := pcommon.NewInstrumentationScope() + scope.SetName(rec.Scope.Name) + scope.SetVersion(rec.Scope.Version) + scope.SetDroppedAttributesCount(rec.Scope.DroppedAttributesCount) + err = scope.Attributes().FromRaw(rec.Scope.Attributes) + require.NoError(t, err) + + resource := pcommon.NewResource() + resource.SetDroppedAttributesCount(rec.Resource.DroppedAttributesCount) + err = resource.Attributes().FromRaw(rec.Resource.Attributes) + require.NoError(t, err) + + return record, scope, resource +} + +func buildOTelRecordTestData(t *testing.T, fn func(OTelRecord) OTelRecord) OTelRecord { + + s := `{ + "@timestamp": "2024-03-12T20:00:41.123456780Z", + "attributes": { + "event.name": "user-password-change", + "foo.some": "bar" + }, + "dropped_attributes_count": 1, + "observed_timestamp": "2024-03-12T20:00:41.123456789Z", + "resource": { + "attributes": { + "host.name": "lebuntu", + "host.os.type": "linux" + }, + "dropped_attributes_count": 2, + "schema_url": "https://opentelemetry.io/schemas/1.6.0" + }, + "scope": { + "attributes": { + "attr.num": 1234, + "attr.str": "val1" + }, + "dropped_attributes_count": 2, + "name": "foobar", + "schema_url": "https://opentelemetry.io/schemas/1.6.1", + "version": "42" + }, + "severity_number": 17, + "severity_text": "ERROR", + "span_id": "0102030405060708", + "trace_flags": 1234, + "trace_id": "01020304050607080900010203040506" +}` + + var record OTelRecord + err := json.Unmarshal([]byte(s), &record) + assert.NoError(t, err) + if fn != nil { + record = fn(record) + } + return record + +} + +func deleteDatasetAttributes(or OTelRecord) { + deleteDatasetAttributesFromMap(or.Attributes) + deleteDatasetAttributesFromMap(or.Scope.Attributes) + deleteDatasetAttributesFromMap(or.Resource.Attributes) +} + +func deleteDatasetAttributesFromMap(m map[string]any) { + delete(m, "data_stream.dataset") + delete(m, "data_stream.namespace") + delete(m, "data_stream.type") +} + +func assignDatastreamData(or OTelRecord, a ...string) OTelRecord { + r := OTelRecordDatastream{ + Dataset: "generic.otel", + Namespace: "default", + Type: "logs", + } + + if len(a) > 0 && a[0] != "" { + r.Type = a[0] + } + if len(a) > 1 && a[1] != "" { + r.Dataset = a[1] + } + if len(a) > 2 && a[2] != "" { + r.Namespace = a[2] + } + + or.Datastream = r + + return or +} + func TestEncodeLogScalarObjectConflict(t *testing.T) { // If there is an attribute named "foo", and another called "foo.bar", // then "foo" will be renamed to "foo.value". @@ -889,7 +1191,7 @@ func TestEncodeLogScalarObjectConflict(t *testing.T) { td := mockResourceLogs() td.ScopeLogs().At(0).LogRecords().At(0).Attributes().PutStr("foo", "scalar") td.ScopeLogs().At(0).LogRecords().At(0).Attributes().PutStr("foo.bar", "baz") - encoded, err := model.encodeLog(td.Resource(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope()) + encoded, err := model.encodeLog(td.Resource(), "", td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope(), "") assert.NoError(t, err) assert.True(t, gjson.ValidBytes(encoded)) @@ -901,7 +1203,7 @@ func TestEncodeLogScalarObjectConflict(t *testing.T) { // If there is an attribute named "foo.value", then "foo" would be omitted rather than renamed. td.ScopeLogs().At(0).LogRecords().At(0).Attributes().PutStr("foo.value", "foovalue") - encoded, err = model.encodeLog(td.Resource(), td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope()) + encoded, err = model.encodeLog(td.Resource(), "", td.ScopeLogs().At(0).LogRecords().At(0), td.ScopeLogs().At(0).Scope(), "") assert.NoError(t, err) assert.False(t, gjson.GetBytes(encoded, "Attributes\\.foo").Exists()) From b4b07d5bde4725b503cea7f16f766903e25c12e6 Mon Sep 17 00:00:00 2001 From: Bomin Rahmani <38274348+BominRahmani@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:16:07 -0400 Subject: [PATCH 14/30] [receiver/vcenter] Enabled vCenter Datacenter metrics by default (#34228) **Description:** The following PR enabled all the metrics that are to be released by v.0.106.0 by default. **Link to tracking Issue:** **Testing:** - Ran integration test, passing - Ran scraper test, passing. **Documentation:** Updated documentation using `make generate` --- ...nter-datacenter-resource-pool-metrics.yaml | 31 +++ receiver/vcenterreceiver/README.md | 2 +- receiver/vcenterreceiver/documentation.md | 234 +++++++++--------- .../internal/metadata/generated_config.go | 20 +- .../internal/metadata/generated_metrics.go | 30 --- .../metadata/generated_metrics_test.go | 50 +--- receiver/vcenterreceiver/metadata.yaml | 40 +-- receiver/vcenterreceiver/metrics.go | 2 +- receiver/vcenterreceiver/scraper_test.go | 10 - .../testdata/integration/expected.yaml | 123 +++++++++ .../testdata/metrics/expected.yaml | 209 ++++++++++++++++ 11 files changed, 507 insertions(+), 244 deletions(-) create mode 100644 .chloggen/enable-vcenter-datacenter-resource-pool-metrics.yaml diff --git a/.chloggen/enable-vcenter-datacenter-resource-pool-metrics.yaml b/.chloggen/enable-vcenter-datacenter-resource-pool-metrics.yaml new file mode 100644 index 000000000000..778e24f34758 --- /dev/null +++ b/.chloggen/enable-vcenter-datacenter-resource-pool-metrics.yaml @@ -0,0 +1,31 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: vcenterreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Enables various vCenter metrics that were disabled by default until v0.106.0" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33607] + +# (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 following metrics will be enabled by default "vcenter.datacenter.cluster.count", "vcenter.datacenter.vm.count", "vcenter.datacenter.datastore.count", + "vcenter.datacenter.host.count", "vcenter.datacenter.disk.space", "vcenter.datacenter.cpu.limit", "vcenter.datacenter.memory.limit", + "vcenter.resource_pool.memory.swapped", "vcenter.resource_pool.memory.ballooned", and "vcenter.resource_pool.memory.granted". The + "resourcePoolMemoryUsageAttribute" has also been bumped up to release v.0.107.0 + +# 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: [user] diff --git a/receiver/vcenterreceiver/README.md b/receiver/vcenterreceiver/README.md index 1357f74f3d3d..76efdcd17a5f 100644 --- a/receiver/vcenterreceiver/README.md +++ b/receiver/vcenterreceiver/README.md @@ -63,4 +63,4 @@ the `vcenter.resource_pool.memory.usage` metric. This feature gate will eventually be enabled by default, and eventually the old implementation will be removed. It aims to give users time to migrate to the new implementation. The target release for this featuregate to be enabled by default -is v0.106.0. +is v0.107.0. diff --git a/receiver/vcenterreceiver/documentation.md b/receiver/vcenterreceiver/documentation.md index 53efcfcdab9d..762417ef7069 100644 --- a/receiver/vcenterreceiver/documentation.md +++ b/receiver/vcenterreceiver/documentation.md @@ -82,6 +82,88 @@ The number of virtual machine templates in the cluster. | ---- | ----------- | ---------- | ----------------------- | --------- | | {virtual_machine_templates} | Sum | Int | Cumulative | false | +### vcenter.datacenter.cluster.count + +The number of clusters in the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {clusters} | Sum | Int | Cumulative | false | + +#### Attributes + +| Name | Description | Values | +| ---- | ----------- | ------ | +| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | + +### vcenter.datacenter.cpu.limit + +The total amount of CPU available to the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {MHz} | Sum | Int | Cumulative | false | + +### vcenter.datacenter.datastore.count + +The number of datastores in the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {datastores} | Sum | Int | Cumulative | false | + +### vcenter.datacenter.disk.space + +The amount of available and used disk space in the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| By | Sum | Int | Cumulative | false | + +#### Attributes + +| Name | Description | Values | +| ---- | ----------- | ------ | +| disk_state | The state of storage and whether it is already allocated or free. | Str: ``available``, ``used`` | + +### vcenter.datacenter.host.count + +The number of hosts in the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {hosts} | Sum | Int | Cumulative | false | + +#### Attributes + +| Name | Description | Values | +| ---- | ----------- | ------ | +| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | +| power_state | The current power state of the host. | Str: ``on``, ``off``, ``standby``, ``unknown`` | + +### vcenter.datacenter.memory.limit + +The total amount of memory available to the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| By | Sum | Int | Cumulative | false | + +### vcenter.datacenter.vm.count + +The number of VM's in the datacenter. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| {virtual_machines} | Sum | Int | Cumulative | false | + +#### Attributes + +| Name | Description | Values | +| ---- | ----------- | ------ | +| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | +| power_state | The current power state of the virtual machine. | Str: ``on``, ``off``, ``suspended``, ``unknown`` | + ### vcenter.datastore.disk.usage The amount of space in the datastore. @@ -306,6 +388,28 @@ The usage of the CPU used by the resource pool. | ---- | ----------- | ---------- | ----------------------- | --------- | | {MHz} | Sum | Int | Cumulative | false | +### vcenter.resource_pool.memory.ballooned + +The amount of memory in a resource pool that is ballooned due to virtualization. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| MiBy | Sum | Int | Cumulative | false | + +### vcenter.resource_pool.memory.granted + +The amount of memory that is granted to VMs in the resource pool from shared and non-shared host memory. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| MiBy | Sum | Int | Cumulative | false | + +#### Attributes + +| Name | Description | Values | +| ---- | ----------- | ------ | +| type | The type of memory granted. | Str: ``private``, ``shared`` | + ### vcenter.resource_pool.memory.shares The amount of shares of memory in the resource pool. @@ -314,6 +418,14 @@ The amount of shares of memory in the resource pool. | ---- | ----------- | ---------- | ----------------------- | --------- | | {shares} | Sum | Int | Cumulative | false | +### vcenter.resource_pool.memory.swapped + +The amount of memory that is granted to VMs in the resource pool from the host's swap space. + +| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | +| ---- | ----------- | ---------- | ----------------------- | --------- | +| MiBy | Sum | Int | Cumulative | false | + ### vcenter.resource_pool.memory.usage The usage of the memory by the resource pool. @@ -530,128 +642,6 @@ As measured over the most recent 20s interval. | ---- | ----------- | ------ | | object | The object on the virtual machine or host that is being reported on. | Any Str | -## Optional Metrics - -The following metrics are not emitted by default. Each of them can be enabled by applying the following configuration: - -```yaml -metrics: - : - enabled: true -``` - -### vcenter.datacenter.cluster.count - -The number of clusters in the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| {clusters} | Sum | Int | Cumulative | false | - -#### Attributes - -| Name | Description | Values | -| ---- | ----------- | ------ | -| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | - -### vcenter.datacenter.cpu.limit - -The total amount of CPU available to the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| {MHz} | Sum | Int | Cumulative | false | - -### vcenter.datacenter.datastore.count - -The number of datastores in the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| {datastores} | Sum | Int | Cumulative | false | - -### vcenter.datacenter.disk.space - -The amount of available and used disk space in the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| By | Sum | Int | Cumulative | false | - -#### Attributes - -| Name | Description | Values | -| ---- | ----------- | ------ | -| disk_state | The state of storage and whether it is already allocated or free. | Str: ``available``, ``used`` | - -### vcenter.datacenter.host.count - -The number of hosts in the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| {hosts} | Sum | Int | Cumulative | false | - -#### Attributes - -| Name | Description | Values | -| ---- | ----------- | ------ | -| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | -| power_state | The current power state of the host. | Str: ``on``, ``off``, ``standby``, ``unknown`` | - -### vcenter.datacenter.memory.limit - -The total amount of memory available to the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| By | Sum | Int | Cumulative | false | - -### vcenter.datacenter.vm.count - -The number of VM's in the datacenter. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| {virtual_machines} | Sum | Int | Cumulative | false | - -#### Attributes - -| Name | Description | Values | -| ---- | ----------- | ------ | -| status | The current status of the managed entity. | Str: ``red``, ``yellow``, ``green``, ``gray`` | -| power_state | The current power state of the virtual machine. | Str: ``on``, ``off``, ``suspended``, ``unknown`` | - -### vcenter.resource_pool.memory.ballooned - -The amount of memory in a resource pool that is ballooned due to virtualization. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| MiBy | Sum | Int | Cumulative | false | - -### vcenter.resource_pool.memory.granted - -The amount of memory that is granted to VMs in the resource pool from shared and non-shared host memory. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| MiBy | Sum | Int | Cumulative | false | - -#### Attributes - -| Name | Description | Values | -| ---- | ----------- | ------ | -| type | The type of memory granted. | Str: ``private``, ``shared`` | - -### vcenter.resource_pool.memory.swapped - -The amount of memory that is granted to VMs in the resource pool from the host's swap space. - -| Unit | Metric Type | Value Type | Aggregation Temporality | Monotonic | -| ---- | ----------- | ---------- | ----------------------- | --------- | -| MiBy | Sum | Int | Cumulative | false | - ## Resource Attributes | Name | Description | Values | Enabled | diff --git a/receiver/vcenterreceiver/internal/metadata/generated_config.go b/receiver/vcenterreceiver/internal/metadata/generated_config.go index f7717e2e960a..309a7c372ce6 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_config.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_config.go @@ -108,25 +108,25 @@ func DefaultMetricsConfig() MetricsConfig { Enabled: true, }, VcenterDatacenterClusterCount: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterCPULimit: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterDatastoreCount: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterDiskSpace: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterHostCount: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterMemoryLimit: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatacenterVMCount: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterDatastoreDiskUsage: MetricConfig{ Enabled: true, @@ -183,16 +183,16 @@ func DefaultMetricsConfig() MetricsConfig { Enabled: true, }, VcenterResourcePoolMemoryBallooned: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterResourcePoolMemoryGranted: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterResourcePoolMemoryShares: MetricConfig{ Enabled: true, }, VcenterResourcePoolMemorySwapped: MetricConfig{ - Enabled: false, + Enabled: true, }, VcenterResourcePoolMemoryUsage: MetricConfig{ Enabled: true, diff --git a/receiver/vcenterreceiver/internal/metadata/generated_metrics.go b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go index 79643aae3775..9f58299f2867 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_metrics.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_metrics.go @@ -3163,36 +3163,6 @@ func WithStartTime(startTime pcommon.Timestamp) metricBuilderOption { } func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.Settings, options ...metricBuilderOption) *MetricsBuilder { - if !mbc.Metrics.VcenterDatacenterClusterCount.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.cluster.count`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterCPULimit.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.cpu.limit`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterDatastoreCount.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.datastore.count`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterDiskSpace.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.disk.space`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterHostCount.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.host.count`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterMemoryLimit.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.memory.limit`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterDatacenterVMCount.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.vm.count`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterResourcePoolMemoryBallooned.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.ballooned`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterResourcePoolMemoryGranted.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.granted`: this metric will be enabled by default starting in release v0.106.0") - } - if !mbc.Metrics.VcenterResourcePoolMemorySwapped.enabledSetByUser { - settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.swapped`: this metric will be enabled by default starting in release v0.106.0") - } mb := &MetricsBuilder{ config: mbc, startTime: pcommon.NewTimestampFromTime(time.Now()), diff --git a/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go b/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go index 9232eeaf908e..b2a973287351 100644 --- a/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go +++ b/receiver/vcenterreceiver/internal/metadata/generated_metrics_test.go @@ -62,46 +62,6 @@ func TestMetricsBuilder(t *testing.T) { mb := NewMetricsBuilder(loadMetricsBuilderConfig(t, test.name), settings, WithStartTime(start)) expectedWarnings := 0 - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.cluster.count`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.cpu.limit`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.datastore.count`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.disk.space`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.host.count`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.memory.limit`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.datacenter.vm.count`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.ballooned`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.granted`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } - if test.metricsSet == testDataSetDefault { - assert.Equal(t, "[WARNING] Please set `enabled` field explicitly for `vcenter.resource_pool.memory.swapped`: this metric will be enabled by default starting in release v0.106.0", observedLogs.All()[expectedWarnings].Message) - expectedWarnings++ - } assert.Equal(t, expectedWarnings, observedLogs.Len()) @@ -136,24 +96,31 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordVcenterClusterVMTemplateCountDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterClusterCountDataPoint(ts, 1, AttributeEntityStatusRed) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterCPULimitDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterDatastoreCountDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterDiskSpaceDataPoint(ts, 1, AttributeDiskStateAvailable) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterHostCountDataPoint(ts, 1, AttributeEntityStatusRed, AttributeHostPowerStateOn) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterMemoryLimitDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterDatacenterVMCountDataPoint(ts, 1, AttributeEntityStatusRed, AttributeVMCountPowerStateOn) @@ -229,9 +196,11 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordVcenterResourcePoolCPUUsageDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterResourcePoolMemoryBalloonedDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterResourcePoolMemoryGrantedDataPoint(ts, 1, AttributeMemoryGrantedTypePrivate) @@ -239,6 +208,7 @@ func TestMetricsBuilder(t *testing.T) { allMetricsCount++ mb.RecordVcenterResourcePoolMemorySharesDataPoint(ts, 1) + defaultMetricsCount++ allMetricsCount++ mb.RecordVcenterResourcePoolMemorySwappedDataPoint(ts, 1) diff --git a/receiver/vcenterreceiver/metadata.yaml b/receiver/vcenterreceiver/metadata.yaml index 566fd9a7125f..1ada781aeafe 100644 --- a/receiver/vcenterreceiver/metadata.yaml +++ b/receiver/vcenterreceiver/metadata.yaml @@ -146,7 +146,7 @@ attributes: metrics: vcenter.datacenter.cluster.count: - enabled: false + enabled: true description: The number of clusters in the datacenter. unit: "{clusters}" sum: @@ -154,10 +154,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [entity_status] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.host.count: - enabled: false + enabled: true description: The number of hosts in the datacenter. unit: "{hosts}" sum: @@ -165,10 +163,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [entity_status, host_power_state] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.vm.count: - enabled: false + enabled: true description: The number of VM's in the datacenter. unit: "{virtual_machines}" sum: @@ -176,10 +172,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [entity_status, vm_count_power_state] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.datastore.count: - enabled: false + enabled: true description: The number of datastores in the datacenter. unit: "{datastores}" sum: @@ -187,10 +181,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.disk.space: - enabled: false + enabled: true description: The amount of available and used disk space in the datacenter. unit: "By" sum: @@ -198,10 +190,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [disk_state] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.cpu.limit: - enabled: false + enabled: true description: The total amount of CPU available to the datacenter. unit: "{MHz}" sum: @@ -209,10 +199,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.datacenter.memory.limit: - enabled: false + enabled: true description: The total amount of memory available to the datacenter. unit: "By" sum: @@ -220,8 +208,6 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.cluster.cpu.limit: enabled: true description: The amount of CPU available to the cluster. @@ -440,7 +426,7 @@ metrics: aggregation_temporality: cumulative attributes: [] vcenter.resource_pool.memory.swapped: - enabled: false + enabled: true description: The amount of memory that is granted to VMs in the resource pool from the host's swap space. unit: MiBy sum: @@ -448,10 +434,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.resource_pool.memory.ballooned: - enabled: false + enabled: true description: The amount of memory in a resource pool that is ballooned due to virtualization. unit: MiBy sum: @@ -459,10 +443,8 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.resource_pool.memory.granted: - enabled: false + enabled: true description: The amount of memory that is granted to VMs in the resource pool from shared and non-shared host memory. unit: MiBy sum: @@ -470,8 +452,6 @@ metrics: value_type: int aggregation_temporality: cumulative attributes: [memory_granted_type] - warnings: - if_enabled_not_set: "this metric will be enabled by default starting in release v0.106.0" vcenter.resource_pool.cpu.usage: enabled: true description: The usage of the CPU used by the resource pool. diff --git a/receiver/vcenterreceiver/metrics.go b/receiver/vcenterreceiver/metrics.go index fbe7e54dc2a7..c9efdb0aa74b 100644 --- a/receiver/vcenterreceiver/metrics.go +++ b/receiver/vcenterreceiver/metrics.go @@ -18,7 +18,7 @@ var enableResourcePoolMemoryUsageAttr = featuregate.GlobalRegistry().MustRegiste featuregate.StageAlpha, featuregate.WithRegisterFromVersion("v0.104.0"), featuregate.WithRegisterDescription("Enables the memory usage type attribute for the vcenter.resource_pool.memory.usage metric"), - featuregate.WithRegisterToVersion("v0.106.0")) + featuregate.WithRegisterToVersion("v0.107.0")) // recordDatacenterStats records stat metrics for a vSphere Datacenter func (v *vcenterMetricScraper) recordDatacenterStats( diff --git a/receiver/vcenterreceiver/scraper_test.go b/receiver/vcenterreceiver/scraper_test.go index e9e07984280c..c550f4d441f4 100644 --- a/receiver/vcenterreceiver/scraper_test.go +++ b/receiver/vcenterreceiver/scraper_test.go @@ -41,16 +41,6 @@ func TestScrapeConfigsEnabled(t *testing.T) { optConfigs := metadata.DefaultMetricsBuilderConfig() setResourcePoolMemoryUsageAttrFeatureGate(t, true) - optConfigs.Metrics.VcenterResourcePoolMemorySwapped.Enabled = true - optConfigs.Metrics.VcenterResourcePoolMemoryBallooned.Enabled = true - optConfigs.Metrics.VcenterResourcePoolMemoryGranted.Enabled = true - optConfigs.Metrics.VcenterDatacenterClusterCount.Enabled = true - optConfigs.Metrics.VcenterDatacenterDatastoreCount.Enabled = true - optConfigs.Metrics.VcenterDatacenterHostCount.Enabled = true - optConfigs.Metrics.VcenterDatacenterVMCount.Enabled = true - optConfigs.Metrics.VcenterDatacenterCPULimit.Enabled = true - optConfigs.Metrics.VcenterDatacenterMemoryLimit.Enabled = true - optConfigs.Metrics.VcenterDatacenterDiskSpace.Enabled = true cfg := &Config{ MetricsBuilderConfig: optConfigs, diff --git a/receiver/vcenterreceiver/testdata/integration/expected.yaml b/receiver/vcenterreceiver/testdata/integration/expected.yaml index 9c40f5b381ae..e32259146619 100644 --- a/receiver/vcenterreceiver/testdata/integration/expected.yaml +++ b/receiver/vcenterreceiver/testdata/integration/expected.yaml @@ -1,4 +1,127 @@ resourceMetrics: + - resource: + attributes: + - key: vcenter.datacenter.name + value: + stringValue: DC0 + scopeMetrics: + - metrics: + - description: The number of clusters in the datacenter. + name: vcenter.datacenter.cluster.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: status + value: + stringValue: gray + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: status + value: + stringValue: green + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: status + value: + stringValue: red + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: status + value: + stringValue: yellow + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{clusters}' + - description: The total amount of CPU available to the datacenter. + name: vcenter.datacenter.cpu.limit + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "18352" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{MHz}' + - description: The number of datastores in the datacenter. + name: vcenter.datacenter.datastore.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{datastores}' + - description: The amount of available and used disk space in the datacenter. + name: vcenter.datacenter.disk.space + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "10952166604800" + attributes: + - key: disk_state + value: + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "42949672960" + attributes: + - key: disk_state + value: + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of hosts in the datacenter. + name: vcenter.datacenter.host.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "4" + attributes: + - key: power_state + value: + stringValue: "on" + - key: status + value: + stringValue: gray + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{hosts}' + - description: The total amount of memory available to the datacenter. + name: vcenter.datacenter.memory.limit + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "17177722880" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of VM's in the datacenter. + name: vcenter.datacenter.vm.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "4" + attributes: + - key: power_state + value: + stringValue: "on" + - key: status + value: + stringValue: green + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{virtual_machines}' + scope: + name: otelcol/vcenterreceiver + version: latest - resource: attributes: - key: vcenter.cluster.name diff --git a/receiver/vcenterreceiver/testdata/metrics/expected.yaml b/receiver/vcenterreceiver/testdata/metrics/expected.yaml index 86ce769db7a3..67a87ccaec2b 100644 --- a/receiver/vcenterreceiver/testdata/metrics/expected.yaml +++ b/receiver/vcenterreceiver/testdata/metrics/expected.yaml @@ -1,4 +1,137 @@ resourceMetrics: + - resource: + attributes: + - key: vcenter.datacenter.name + value: + stringValue: Datacenter + scopeMetrics: + - metrics: + - description: The number of clusters in the datacenter. + name: vcenter.datacenter.cluster.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + attributes: + - key: status + value: + stringValue: gray + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: status + value: + stringValue: green + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: status + value: + stringValue: red + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "0" + attributes: + - key: status + value: + stringValue: yellow + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{clusters}' + - description: The total amount of CPU available to the datacenter. + name: vcenter.datacenter.cpu.limit + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "186696" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{MHz}' + - description: The number of datastores in the datacenter. + name: vcenter.datacenter.datastore.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{datastores}' + - description: The amount of available and used disk space in the datacenter. + name: vcenter.datacenter.disk.space + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "51693551508648" + attributes: + - key: disk_state + value: + stringValue: available + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "5917763748696" + attributes: + - key: disk_state + value: + stringValue: used + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of hosts in the datacenter. + name: vcenter.datacenter.host.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + attributes: + - key: power_state + value: + stringValue: "on" + - key: status + value: + stringValue: green + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{hosts}' + - description: The total amount of memory available to the datacenter. + name: vcenter.datacenter.memory.limit + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "1645526253568" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: By + - description: The number of VM's in the datacenter. + name: vcenter.datacenter.vm.count + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "2" + attributes: + - key: power_state + value: + stringValue: "on" + - key: status + value: + stringValue: green + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: power_state + value: + stringValue: "on" + - key: status + value: + stringValue: yellow + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: '{virtual_machines}' + scope: + name: otelcol/vcenterreceiver + version: latest - resource: attributes: - key: vcenter.cluster.name @@ -5452,6 +5585,35 @@ resourceMetrics: startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: '{MHz}' + - description: The amount of memory in a resource pool that is ballooned due to virtualization. + name: vcenter.resource_pool.memory.ballooned + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The amount of memory that is granted to VMs in the resource pool from shared and non-shared host memory. + name: vcenter.resource_pool.memory.granted + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "199617" + attributes: + - key: type + value: + stringValue: private + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: type + value: + stringValue: shared + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy - description: The amount of shares of memory in the resource pool. name: vcenter.resource_pool.memory.shares sum: @@ -5461,6 +5623,15 @@ resourceMetrics: startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: '{shares}' + - description: The amount of memory that is granted to VMs in the resource pool from the host's swap space. + name: vcenter.resource_pool.memory.swapped + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy - description: The usage of the memory by the resource pool. name: vcenter.resource_pool.memory.usage sum: @@ -5506,6 +5677,35 @@ resourceMetrics: startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: '{MHz}' + - description: The amount of memory in a resource pool that is ballooned due to virtualization. + name: vcenter.resource_pool.memory.ballooned + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy + - description: The amount of memory that is granted to VMs in the resource pool from shared and non-shared host memory. + name: vcenter.resource_pool.memory.granted + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "199617" + attributes: + - key: type + value: + stringValue: private + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + - asInt: "1" + attributes: + - key: type + value: + stringValue: shared + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy - description: The amount of shares of memory in the resource pool. name: vcenter.resource_pool.memory.shares sum: @@ -5515,6 +5715,15 @@ resourceMetrics: startTimeUnixNano: "1000000" timeUnixNano: "2000000" unit: '{shares}' + - description: The amount of memory that is granted to VMs in the resource pool from the host's swap space. + name: vcenter.resource_pool.memory.swapped + sum: + aggregationTemporality: 2 + dataPoints: + - asInt: "0" + startTimeUnixNano: "1000000" + timeUnixNano: "2000000" + unit: MiBy - description: The usage of the memory by the resource pool. name: vcenter.resource_pool.memory.usage sum: From 76c03ec2810e5dbbc34970736a5fd40baf8ddf61 Mon Sep 17 00:00:00 2001 From: Florian Bacher Date: Wed, 24 Jul 2024 10:26:34 +0200 Subject: [PATCH 15/30] [receiver/statsd] log only non-EOF errors when reading payload received via TCP (#33978) **Description:** This PR modifies the tcp server of the statsd receiver to log errors only if they are not an `io.EOF`, as this one is expected when the payload has been read completely. **Link to tracking Issue:** #33951 **Testing:** The affected function has already been covered by existing tests. The only thing changed was whether to log the error or not. **Documentation:** None required, as there have been no changes from user perspective --------- Signed-off-by: Florian Bacher --- .chloggen/statsreceiver_tcp_transport.yaml | 27 +++++++++++++++++++ .../internal/transport/tcp_server.go | 4 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 .chloggen/statsreceiver_tcp_transport.yaml diff --git a/.chloggen/statsreceiver_tcp_transport.yaml b/.chloggen/statsreceiver_tcp_transport.yaml new file mode 100644 index 000000000000..c498744350a5 --- /dev/null +++ b/.chloggen/statsreceiver_tcp_transport.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: statsdeceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Log only non-EOF errors when reading payload received via TCP. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33951] + +# (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: [user] \ No newline at end of file diff --git a/receiver/statsdreceiver/internal/transport/tcp_server.go b/receiver/statsdreceiver/internal/transport/tcp_server.go index f776bcd88f04..f1bed8de50fe 100644 --- a/receiver/statsdreceiver/internal/transport/tcp_server.go +++ b/receiver/statsdreceiver/internal/transport/tcp_server.go @@ -85,7 +85,9 @@ func (t *tcpServer) handleConn(c net.Conn, transferChan chan<- Metric) { for { n, err := c.Read(payload) if err != nil { - t.reporter.OnDebugf("TCP transport (%s) Error reading payload: %v", c.LocalAddr(), err) + if !errors.Is(err, io.EOF) { + t.reporter.OnDebugf("TCP transport (%s) Error reading payload: %v", c.LocalAddr(), err) + } t.wg.Done() return } From d5c40d3f1cdecf3d2764034df43ef7c38d7ef4f2 Mon Sep 17 00:00:00 2001 From: odubajDT <93584209+odubajDT@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:21:22 +0200 Subject: [PATCH 16/30] [chore][connector/spanmetrics]: replace `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` (#34226) **Description:** - replaces `github.com/tilinna/clock` with `github.com/jonboulle/clockwork` in `spanmetrics connector` **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34190 **Connected PRs:** - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34221 - https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34224 --------- Signed-off-by: odubajDT --- cmd/otelcontribcol/go.mod | 1 - cmd/otelcontribcol/go.sum | 2 - connector/spanmetricsconnector/connector.go | 10 ++-- .../spanmetricsconnector/connector_test.go | 54 +++++++++---------- connector/spanmetricsconnector/factory.go | 4 +- connector/spanmetricsconnector/go.mod | 2 +- connector/spanmetricsconnector/go.sum | 4 +- .../integrationtest/go.mod | 2 +- .../integrationtest/go.sum | 4 +- testbed/go.mod | 2 +- testbed/go.sum | 4 +- 11 files changed, 43 insertions(+), 46 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 73ea2f09173e..3c67ee44769d 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -733,7 +733,6 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect - github.com/tilinna/clock v1.1.0 // indirect github.com/tinylib/msgp v1.2.0 // indirect github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/tklauser/numcpus v0.8.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 4bf531fbfa56..f6c2e6398488 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -2241,8 +2241,6 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= diff --git a/connector/spanmetricsconnector/connector.go b/connector/spanmetricsconnector/connector.go index c145a6b80d68..2cdc354df9d8 100644 --- a/connector/spanmetricsconnector/connector.go +++ b/connector/spanmetricsconnector/connector.go @@ -10,8 +10,8 @@ import ( "time" "github.com/hashicorp/golang-lru/v2/simplelru" + "github.com/jonboulle/clockwork" "github.com/lightstep/go-expohisto/structure" - "github.com/tilinna/clock" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" @@ -63,8 +63,8 @@ type connectorImp struct { // e.g. { "foo/barOK": { "serviceName": "foo", "span.name": "/bar", "status_code": "OK" }} metricKeyToDimensions *cache.Cache[metrics.Key, pcommon.Map] - clock clock.Clock - ticker *clock.Ticker + clock clockwork.Clock + ticker clockwork.Ticker done chan struct{} started bool @@ -110,7 +110,7 @@ func newDimensions(cfgDims []Dimension) []dimension { return dims } -func newConnector(logger *zap.Logger, config component.Config, clock clock.Clock) (*connectorImp, error) { +func newConnector(logger *zap.Logger, config component.Config, clock clockwork.Clock) (*connectorImp, error) { logger.Info("Building spanmetrics connector") cfg := config.(*Config) @@ -213,7 +213,7 @@ func (p *connectorImp) Start(ctx context.Context, _ component.Host) error { select { case <-p.done: return - case <-p.ticker.C: + case <-p.ticker.Chan(): p.exportMetrics(ctx) } } diff --git a/connector/spanmetricsconnector/connector_test.go b/connector/spanmetricsconnector/connector_test.go index 3df103b4d673..a58de25fbbc3 100644 --- a/connector/spanmetricsconnector/connector_test.go +++ b/connector/spanmetricsconnector/connector_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" + "github.com/jonboulle/clockwork" "github.com/lightstep/go-expohisto/structure" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tilinna/clock" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer" @@ -452,7 +452,7 @@ func disabledHistogramsConfig() HistogramConfig { } } -func newConnectorImp(defaultNullValue *string, histogramConfig func() HistogramConfig, exemplarsConfig func() ExemplarsConfig, eventsConfig func() EventsConfig, temporality string, expiration time.Duration, resourceMetricsKeyAttributes []string, deltaTimestampCacheSize int, clock clock.Clock, excludedDimensions ...string) (*connectorImp, error) { +func newConnectorImp(defaultNullValue *string, histogramConfig func() HistogramConfig, exemplarsConfig func() ExemplarsConfig, eventsConfig func() EventsConfig, temporality string, expiration time.Duration, resourceMetricsKeyAttributes []string, deltaTimestampCacheSize int, clock clockwork.Clock, excludedDimensions ...string) (*connectorImp, error) { cfg := &Config{ AggregationTemporality: temporality, Histogram: histogramConfig(), @@ -498,7 +498,7 @@ func stringp(str string) *string { func TestBuildKeySameServiceNameCharSequence(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) require.NoError(t, err) span0 := ptrace.NewSpan() @@ -518,7 +518,7 @@ func TestBuildKeyExcludeDimensionsAll(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) cfg.ExcludeDimensions = []string{"span.kind", "service.name", "span.name", "status.code"} - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) require.NoError(t, err) span0 := ptrace.NewSpan() @@ -531,7 +531,7 @@ func TestBuildKeyExcludeWrongDimensions(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) cfg.ExcludeDimensions = []string{"span.kind", "service.name.wrong.name", "span.name", "status.code"} - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) require.NoError(t, err) span0 := ptrace.NewSpan() @@ -543,7 +543,7 @@ func TestBuildKeyExcludeWrongDimensions(t *testing.T) { func TestBuildKeyWithDimensions(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) require.NoError(t, err) defaultFoo := pcommon.NewValueStr("bar") @@ -639,7 +639,7 @@ func TestConcurrentShutdown(t *testing.T) { core, observedLogs := observer.New(zapcore.InfoLevel) // Test - p, err := newConnectorImp(nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clockwork.NewFakeClock()) require.NoError(t, err) // Override the default no-op consumer and logger for testing. p.metricsConsumer = new(consumertest.MetricsSink) @@ -684,7 +684,7 @@ func TestConnectorCapabilities(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) // Test - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) // Override the default no-op consumer for testing. c.metricsConsumer = new(consumertest.MetricsSink) assert.NoError(t, err) @@ -717,7 +717,7 @@ func TestConsumeMetricsErrors(t *testing.T) { logger := zap.New(core) var wg sync.WaitGroup - mockClock := clock.NewMock(time.Now()) + mockClock := clockwork.NewFakeClock() p, err := newConnectorImp(nil, explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, mockClock) require.NoError(t, err) // Override the default no-op consumer and logger for testing. @@ -740,7 +740,7 @@ func TestConsumeMetricsErrors(t *testing.T) { // Trigger flush. wg.Add(1) - mockClock.Add(time.Nanosecond) + mockClock.Advance(time.Nanosecond) wg.Wait() // Allow time for log observer to sync all logs emitted. @@ -883,7 +883,7 @@ func TestConsumeTraces(t *testing.T) { // Prepare mcon := &consumertest.MetricsSink{} - mockClock := clock.NewMock(time.Now()) + mockClock := clockwork.NewFakeClock() p, err := newConnectorImp(stringp("defaultNullValue"), tc.histogramConfig, tc.exemplarConfig, disabledEventsConfig, tc.aggregationTemporality, 0, []string{}, 1000, mockClock) require.NoError(t, err) // Override the default no-op consumer with metrics sink for testing. @@ -900,7 +900,7 @@ func TestConsumeTraces(t *testing.T) { assert.NoError(t, err) // Trigger flush. - mockClock.Add(time.Nanosecond) + mockClock.Advance(time.Nanosecond) require.Eventually(t, func() bool { return len(mcon.AllMetrics()) > 0 }, 1*time.Second, 10*time.Millisecond) @@ -911,7 +911,7 @@ func TestConsumeTraces(t *testing.T) { } func TestMetricKeyCache(t *testing.T) { - p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clockwork.NewFakeClock()) require.NoError(t, err) traces := buildSampleTrace() @@ -940,7 +940,7 @@ func TestMetricKeyCache(t *testing.T) { } func TestResourceMetricsCache(t *testing.T) { - p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clockwork.NewFakeClock()) require.NoError(t, err) // Test @@ -977,7 +977,7 @@ func TestResourceMetricsCache(t *testing.T) { } func TestResourceMetricsExpiration(t *testing.T) { - p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 1*time.Millisecond, []string{}, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 1*time.Millisecond, []string{}, 1000, clockwork.NewFakeClock()) require.NoError(t, err) // Test @@ -1002,7 +1002,7 @@ func TestResourceMetricsKeyAttributes(t *testing.T) { "service.name", } - p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, resourceMetricsKeyAttributes, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, resourceMetricsKeyAttributes, 1000, clockwork.NewFakeClock()) require.NoError(t, err) // Test @@ -1040,7 +1040,7 @@ func TestResourceMetricsKeyAttributes(t *testing.T) { func BenchmarkConnectorConsumeTraces(b *testing.B) { // Prepare - conn, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clock.NewMock(time.Now())) + conn, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clockwork.NewFakeClock()) require.NoError(b, err) traces := buildSampleTrace() @@ -1054,7 +1054,7 @@ func BenchmarkConnectorConsumeTraces(b *testing.B) { func TestExcludeDimensionsConsumeTraces(t *testing.T) { excludeDimensions := []string{"span.kind", "span.name", "totallyWrongNameDoesNotAffectAnything"} - p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clock.NewMock(time.Now()), excludeDimensions...) + p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, clockwork.NewFakeClock(), excludeDimensions...) require.NoError(t, err) traces := buildSampleTrace() @@ -1184,7 +1184,7 @@ func TestConnectorConsumeTracesEvictedCacheKey(t *testing.T) { wg.Add(len(wantDataPointCounts)) // Note: default dimension key cache size is 2. - mockClock := clock.NewMock(time.Now()) + mockClock := clockwork.NewFakeClock() p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 0, []string{}, 1000, mockClock) require.NoError(t, err) // Override the default no-op consumer with metrics sink for testing. @@ -1204,7 +1204,7 @@ func TestConnectorConsumeTracesEvictedCacheKey(t *testing.T) { time.Sleep(time.Millisecond) // Trigger flush. - mockClock.Add(time.Nanosecond) + mockClock.Advance(time.Nanosecond) // Allow time for metrics flush to complete. time.Sleep(time.Millisecond) @@ -1270,7 +1270,7 @@ func TestConnectorConsumeTracesExpiredMetrics(t *testing.T) { mcon := &consumertest.MetricsSink{} // Creating a connector with a very short metricsTTL to ensure that the metrics are expired. - mockClock := clock.NewMock(time.Now()) + mockClock := clockwork.NewFakeClock() p, err := newConnectorImp(stringp("defaultNullValue"), explicitHistogramsConfig, disabledExemplarsConfig, disabledEventsConfig, cumulative, 1*time.Nanosecond, []string{}, 1000, mockClock) require.NoError(t, err) // Override the default no-op consumer with metrics sink for testing. @@ -1295,7 +1295,7 @@ func TestConnectorConsumeTracesExpiredMetrics(t *testing.T) { time.Sleep(time.Millisecond) // Trigger flush. - mockClock.Add(time.Nanosecond) + mockClock.Advance(time.Nanosecond) // Allow time for metrics flush to complete. time.Sleep(time.Millisecond) @@ -1491,7 +1491,7 @@ func TestSpanMetrics_Events(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) cfg.Events = tt.eventsConfig - c, err := newConnector(zaptest.NewLogger(t), cfg, clock.NewMock(time.Now())) + c, err := newConnector(zaptest.NewLogger(t), cfg, clockwork.NewFakeClock()) require.NoError(t, err) err = c.ConsumeTraces(context.Background(), buildSampleTrace()) require.NoError(t, err) @@ -1546,7 +1546,7 @@ func TestExemplarsAreDiscardedAfterFlushing(t *testing.T) { } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - p, err := newConnectorImp(stringp("defaultNullValue"), tt.histogramConfig, enabledExemplarsConfig, enabledEventsConfig, tt.temporality, 0, []string{}, 1000, clock.NewMock(time.Now())) + p, err := newConnectorImp(stringp("defaultNullValue"), tt.histogramConfig, enabledExemplarsConfig, enabledEventsConfig, tt.temporality, 0, []string{}, 1000, clockwork.NewFakeClock()) p.metricsConsumer = &consumertest.MetricsSink{} require.NoError(t, err) @@ -1843,16 +1843,16 @@ func TestDeltaTimestampCacheExpiry(t *testing.T) { // Clock where Now() always returns a greater value than the previous return value type alwaysIncreasingClock struct { - clock.Clock + clockwork.Clock } func newAlwaysIncreasingClock() alwaysIncreasingClock { return alwaysIncreasingClock{ - Clock: clock.NewMock(time.Now()), + Clock: clockwork.NewFakeClock(), } } func (c alwaysIncreasingClock) Now() time.Time { - c.Clock.(*clock.Mock).Add(time.Second) + c.Clock.(clockwork.FakeClock).Advance(time.Millisecond) return c.Clock.Now() } diff --git a/connector/spanmetricsconnector/factory.go b/connector/spanmetricsconnector/factory.go index 0e1ada1048d7..b153fde6bb31 100644 --- a/connector/spanmetricsconnector/factory.go +++ b/connector/spanmetricsconnector/factory.go @@ -9,7 +9,7 @@ import ( "context" "time" - "github.com/tilinna/clock" + "github.com/jonboulle/clockwork" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/consumer" @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { } func createTracesToMetricsConnector(ctx context.Context, params connector.Settings, cfg component.Config, nextConsumer consumer.Metrics) (connector.Traces, error) { - c, err := newConnector(params.Logger, cfg, clock.FromContext(ctx)) + c, err := newConnector(params.Logger, cfg, clockwork.FromContext(ctx)) if err != nil { return nil, err } diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index ac66b5a31a6a..08ff28e53856 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -5,11 +5,11 @@ go 1.21.0 require ( github.com/hashicorp/golang-lru v1.0.2 github.com/hashicorp/golang-lru/v2 v2.0.7 + github.com/jonboulle/clockwork v0.4.0 github.com/lightstep/go-expohisto v1.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.105.0 github.com/stretchr/testify v1.9.0 - github.com/tilinna/clock v1.1.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/connector v0.105.1-0.20240717163034-43ed6184f9fe diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index 7aa31c993050..c5ee59833fee 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -25,6 +25,8 @@ github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iP github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= 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/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -68,8 +70,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod index a072dca2a347..001225b71356 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.mod +++ b/exporter/elasticsearchexporter/integrationtest/go.mod @@ -66,6 +66,7 @@ require ( github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jaegertracing/jaeger v1.59.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/compress v1.17.9 // indirect @@ -114,7 +115,6 @@ require ( github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tilinna/clock v1.1.0 // indirect github.com/tklauser/go-sysconf v0.3.13 // indirect github.com/tklauser/numcpus v0.7.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect diff --git a/exporter/elasticsearchexporter/integrationtest/go.sum b/exporter/elasticsearchexporter/integrationtest/go.sum index 4c13b2a01b8b..af9275677b4e 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.sum +++ b/exporter/elasticsearchexporter/integrationtest/go.sum @@ -125,6 +125,8 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/jaegertracing/jaeger v1.59.0 h1:p9/nJxdoCxq4NSgVN8P0aDqlGSfxFaggpNfLwhqQZRc= github.com/jaegertracing/jaeger v1.59.0/go.mod h1:IZeUGtxNIYWGD3PVI4mqAn2IWVrfGdfswB8XK0mzZ0w= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -242,8 +244,6 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/tklauser/go-sysconf v0.3.13 h1:GBUpcahXSpR2xN01jhkNAbTLRk2Yzgggk8IM08lq3r4= github.com/tklauser/go-sysconf v0.3.13/go.mod h1:zwleP4Q4OehZHGn4CYZDipCgg9usW5IJePewFCGVEa0= github.com/tklauser/numcpus v0.7.0 h1:yjuerZP127QG9m5Zh/mSO4wqurYil27tHrqwRoRjpr4= diff --git a/testbed/go.mod b/testbed/go.mod index 3cb7e3a9b60b..2af3231516ee 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -161,6 +161,7 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jonboulle/clockwork v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -222,7 +223,6 @@ require ( github.com/soheilhy/cmux v0.1.5 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/tilinna/clock v1.1.0 // indirect github.com/tinylib/msgp v1.2.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index b316190de588..79510c497f21 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -397,6 +397,8 @@ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9Y github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= @@ -646,8 +648,6 @@ github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8= github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= -github.com/tilinna/clock v1.1.0 h1:6IQQQCo6KoBxVudv6gwtY8o4eDfhHo8ojA5dP0MfhSs= -github.com/tilinna/clock v1.1.0/go.mod h1:ZsP7BcY7sEEz7ktc0IVy8Us6boDrK8VradlKRUGfOao= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= From daaaf62bd6a97d58434156c4f3b4c20083efbe2e Mon Sep 17 00:00:00 2001 From: "Chris M." Date: Wed, 24 Jul 2024 20:51:16 +0300 Subject: [PATCH 17/30] [wip] Add skeleton for the `otlpjson` connector (#34239) **Description:** This is the first PR for the new `otlpjson` connector. Includes the overall structure of the new component. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208 **Testing:** **Documentation:** /cc @djaglowski Signed-off-by: ChrsMark --- .chloggen/add_otlpjson_connector.yaml | 27 ++++ .github/CODEOWNERS | 1 + .github/ISSUE_TEMPLATE/bug_report.yaml | 1 + .github/ISSUE_TEMPLATE/feature_request.yaml | 1 + .github/ISSUE_TEMPLATE/other.yaml | 1 + .github/ISSUE_TEMPLATE/unmaintained.yaml | 1 + connector/otlpjsonconnector/Makefile | 1 + connector/otlpjsonconnector/README.md | 68 ++++++++ connector/otlpjsonconnector/config.go | 10 ++ connector/otlpjsonconnector/config_test.go | 4 + connector/otlpjsonconnector/doc.go | 6 + connector/otlpjsonconnector/factory.go | 60 +++++++ connector/otlpjsonconnector/factory_test.go | 30 ++++ .../generated_component_test.go | 87 ++++++++++ .../generated_package_test.go | 13 ++ connector/otlpjsonconnector/go.mod | 58 +++++++ connector/otlpjsonconnector/go.sum | 148 ++++++++++++++++++ .../internal/metadata/generated_status.go | 17 ++ connector/otlpjsonconnector/logs.go | 45 ++++++ connector/otlpjsonconnector/metadata.yaml | 9 ++ connector/otlpjsonconnector/metrics.go | 45 ++++++ .../otlpjsonconnector/testdata/config.yaml | 0 connector/otlpjsonconnector/traces.go | 45 ++++++ reports/distributions/contrib.yaml | 1 + versions.yaml | 1 + 25 files changed, 680 insertions(+) create mode 100644 .chloggen/add_otlpjson_connector.yaml create mode 100644 connector/otlpjsonconnector/Makefile create mode 100644 connector/otlpjsonconnector/README.md create mode 100644 connector/otlpjsonconnector/config.go create mode 100644 connector/otlpjsonconnector/config_test.go create mode 100644 connector/otlpjsonconnector/doc.go create mode 100644 connector/otlpjsonconnector/factory.go create mode 100644 connector/otlpjsonconnector/factory_test.go create mode 100644 connector/otlpjsonconnector/generated_component_test.go create mode 100644 connector/otlpjsonconnector/generated_package_test.go create mode 100644 connector/otlpjsonconnector/go.mod create mode 100644 connector/otlpjsonconnector/go.sum create mode 100644 connector/otlpjsonconnector/internal/metadata/generated_status.go create mode 100644 connector/otlpjsonconnector/logs.go create mode 100644 connector/otlpjsonconnector/metadata.yaml create mode 100644 connector/otlpjsonconnector/metrics.go create mode 100644 connector/otlpjsonconnector/testdata/config.yaml create mode 100644 connector/otlpjsonconnector/traces.go diff --git a/.chloggen/add_otlpjson_connector.yaml b/.chloggen/add_otlpjson_connector.yaml new file mode 100644 index 000000000000..6869baa31206 --- /dev/null +++ b/.chloggen/add_otlpjson_connector.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: new_component + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: otlpjsonconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: New component that will allow extracting otlpjson data from incoming Logs. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34239, 34208] + +# (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/.github/CODEOWNERS b/.github/CODEOWNERS index 868d7b3950bf..c254063358bd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -29,6 +29,7 @@ connector/datadogconnector/ @open-teleme connector/exceptionsconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @marctc connector/failoverconnector/ @open-telemetry/collector-contrib-approvers @akats7 @djaglowski @fatsheep9146 connector/grafanacloudconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @rlankfo @jcreixell +connector/otlpjsonconnector/ @open-telemetry/collector-contrib-approvers @djaglowski @ChrsMark connector/roundrobinconnector/ @open-telemetry/collector-contrib-approvers @bogdandrutu connector/routingconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @mwear connector/servicegraphconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno @JaredTan95 diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index f598d533b7f6..46151d60a1ab 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -30,6 +30,7 @@ body: - connector/exceptions - connector/failover - connector/grafanacloud + - connector/otlpjson - connector/roundrobin - connector/routing - connector/servicegraph diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 260c716e448f..240e02871576 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -24,6 +24,7 @@ body: - connector/exceptions - connector/failover - connector/grafanacloud + - connector/otlpjson - connector/roundrobin - connector/routing - connector/servicegraph diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 6516b7e79143..a08b442d47ab 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -24,6 +24,7 @@ body: - connector/exceptions - connector/failover - connector/grafanacloud + - connector/otlpjson - connector/roundrobin - connector/routing - connector/servicegraph diff --git a/.github/ISSUE_TEMPLATE/unmaintained.yaml b/.github/ISSUE_TEMPLATE/unmaintained.yaml index 6c7163309790..b0340cec3b02 100644 --- a/.github/ISSUE_TEMPLATE/unmaintained.yaml +++ b/.github/ISSUE_TEMPLATE/unmaintained.yaml @@ -29,6 +29,7 @@ body: - connector/exceptions - connector/failover - connector/grafanacloud + - connector/otlpjson - connector/roundrobin - connector/routing - connector/servicegraph diff --git a/connector/otlpjsonconnector/Makefile b/connector/otlpjsonconnector/Makefile new file mode 100644 index 000000000000..ded7a36092dc --- /dev/null +++ b/connector/otlpjsonconnector/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/connector/otlpjsonconnector/README.md b/connector/otlpjsonconnector/README.md new file mode 100644 index 000000000000..6e61f650932f --- /dev/null +++ b/connector/otlpjsonconnector/README.md @@ -0,0 +1,68 @@ +# otlpjson Connector + + +| Status | | +| ------------- |-----------| +| Distributions | [contrib] | +| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fotlpjson%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fotlpjson) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fotlpjson%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fotlpjson) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@ChrsMark](https://www.github.com/ChrsMark) | + +[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib + +## Supported Pipeline Types + +| [Exporter Pipeline Type] | [Receiver Pipeline Type] | [Stability Level] | +| ------------------------ | ------------------------ | ----------------- | +| logs | metrics | [development] | +| logs | traces | [development] | +| logs | logs | [development] | + +[Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type +[Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type +[Stability Level]: https://github.com/open-telemetry/opentelemetry-collector#stability-levels + + +Allows to extract otlpjson data from incoming Logs and specifically the `Body` field. +The data is written in +[Protobuf JSON +encoding](https://developers.google.com/protocol-buffers/docs/proto3#json) +using [OpenTelemetry +protocol](https://github.com/open-telemetry/opentelemetry-proto). + +## Configuration + +#### Configuration Example: + +```yaml +receivers: + filelog: + include: + - /var/log/foo.log + +exporters: + debug: + +connectors: + otlpjson: + +service: + pipelines: + logs/raw: + receivers: [filelog] + exporters: [otlpjson] + metrics/otlp: + receivers: [otlpjson] + exporters: [debug] + logs/otlp: + receivers: [otlpjson] + exporters: [debug] + traces/otlp: + receivers: [otlpjson] + exporters: [debug] +``` + +[Connectors README]:https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md +[Exporter Pipeline Type]:https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type +[Receiver Pipeline Type]:https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type +[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib \ No newline at end of file diff --git a/connector/otlpjsonconnector/config.go b/connector/otlpjsonconnector/config.go new file mode 100644 index 000000000000..180fa353c5dd --- /dev/null +++ b/connector/otlpjsonconnector/config.go @@ -0,0 +1,10 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" + +type Config struct{} + +func (c *Config) Validate() error { + return nil +} diff --git a/connector/otlpjsonconnector/config_test.go b/connector/otlpjsonconnector/config_test.go new file mode 100644 index 000000000000..d594196c182b --- /dev/null +++ b/connector/otlpjsonconnector/config_test.go @@ -0,0 +1,4 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector diff --git a/connector/otlpjsonconnector/doc.go b/connector/otlpjsonconnector/doc.go new file mode 100644 index 000000000000..baf3aede2b17 --- /dev/null +++ b/connector/otlpjsonconnector/doc.go @@ -0,0 +1,6 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:generate mdatagen metadata.yaml + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" diff --git a/connector/otlpjsonconnector/factory.go b/connector/otlpjsonconnector/factory.go new file mode 100644 index 000000000000..1f4dca456bac --- /dev/null +++ b/connector/otlpjsonconnector/factory.go @@ -0,0 +1,60 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" + +import ( + "context" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/consumer" + + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector/internal/metadata" +) + +// NewFactory returns a ConnectorFactory. +func NewFactory() connector.Factory { + return connector.NewFactory( + metadata.Type, + createDefaultConfig, + connector.WithLogsToTraces(createTracesConnector, component.StabilityLevelAlpha), + connector.WithLogsToMetrics(createMetricsConnector, component.StabilityLevelAlpha), + connector.WithLogsToLogs(createLogsConnector, component.StabilityLevelAlpha), + ) +} + +// createDefaultConfig creates the default configuration. +func createDefaultConfig() component.Config { + return &Config{} +} + +// createLogsConnector returns a connector which consume logs and export logs +func createLogsConnector( + _ context.Context, + set connector.Settings, + cfg component.Config, + nextConsumer consumer.Logs, +) (connector.Logs, error) { + return newLogsConnector(set, cfg, nextConsumer), nil +} + +// createTracesConnector returns a connector which consume logs and export traces +func createTracesConnector( + _ context.Context, + set connector.Settings, + cfg component.Config, + nextConsumer consumer.Traces, +) (connector.Logs, error) { + return newTracesConnector(set, cfg, nextConsumer), nil +} + +// createMetricsConnector returns a connector which consume logs and export metrics +func createMetricsConnector( + _ context.Context, + set connector.Settings, + cfg component.Config, + nextConsumer consumer.Metrics, +) (connector.Logs, error) { + return newMetricsConnector(set, cfg, nextConsumer), nil +} diff --git a/connector/otlpjsonconnector/factory_test.go b/connector/otlpjsonconnector/factory_test.go new file mode 100644 index 000000000000..8a8c9f5578f8 --- /dev/null +++ b/connector/otlpjsonconnector/factory_test.go @@ -0,0 +1,30 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/connector/connectortest" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/plog" +) + +func TestNewFactory(t *testing.T) { + cfg := &Config{} + + lc, err := consumer.NewLogs(func(context.Context, plog.Logs) error { + return nil + }) + assert.NoError(t, err) + + factory := NewFactory() + conn, err := factory.CreateLogsToLogs(context.Background(), + connectortest.NewNopSettings(), cfg, lc) + + assert.NoError(t, err) + assert.NotNil(t, conn) +} diff --git a/connector/otlpjsonconnector/generated_component_test.go b/connector/otlpjsonconnector/generated_component_test.go new file mode 100644 index 000000000000..df5aee638e7c --- /dev/null +++ b/connector/otlpjsonconnector/generated_component_test.go @@ -0,0 +1,87 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package otlpjsonconnector + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/confmap/confmaptest" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/connector/connectortest" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumertest" +) + +func TestComponentFactoryType(t *testing.T) { + require.Equal(t, "otlpjson", NewFactory().Type().String()) +} + +func TestComponentConfigStruct(t *testing.T) { + require.NoError(t, componenttest.CheckConfigStruct(NewFactory().CreateDefaultConfig())) +} + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) + }{ + + { + name: "logs_to_logs", + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { + router := connector.NewLogsRouter(map[component.ID]consumer.Logs{component.NewID(component.DataTypeLogs): consumertest.NewNop()}) + return factory.CreateLogsToLogs(ctx, set, cfg, router) + }, + }, + + { + name: "logs_to_metrics", + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { + router := connector.NewMetricsRouter(map[component.ID]consumer.Metrics{component.NewID(component.DataTypeMetrics): consumertest.NewNop()}) + return factory.CreateLogsToMetrics(ctx, set, cfg, router) + }, + }, + + { + name: "logs_to_traces", + createFn: func(ctx context.Context, set connector.Settings, cfg component.Config) (component.Component, error) { + router := connector.NewTracesRouter(map[component.ID]consumer.Traces{component.NewID(component.DataTypeTraces): consumertest.NewNop()}) + return factory.CreateLogsToTraces(ctx, set, cfg, router) + }, + }, + } + + cm, err := confmaptest.LoadConf("metadata.yaml") + require.NoError(t, err) + cfg := factory.CreateDefaultConfig() + sub, err := cm.Sub("tests::config") + require.NoError(t, err) + require.NoError(t, sub.Unmarshal(&cfg)) + + for _, test := range tests { + t.Run(test.name+"-shutdown", func(t *testing.T) { + c, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + t.Run(test.name+"-lifecycle", func(t *testing.T) { + firstConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + require.NoError(t, err) + require.NoError(t, firstConnector.Start(context.Background(), host)) + require.NoError(t, firstConnector.Shutdown(context.Background())) + secondConnector, err := test.createFn(context.Background(), connectortest.NewNopSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondConnector.Start(context.Background(), host)) + require.NoError(t, secondConnector.Shutdown(context.Background())) + }) + } +} diff --git a/connector/otlpjsonconnector/generated_package_test.go b/connector/otlpjsonconnector/generated_package_test.go new file mode 100644 index 000000000000..4b175e766bb3 --- /dev/null +++ b/connector/otlpjsonconnector/generated_package_test.go @@ -0,0 +1,13 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package otlpjsonconnector + +import ( + "testing" + + "go.uber.org/goleak" +) + +func TestMain(m *testing.M) { + goleak.VerifyTestMain(m) +} diff --git a/connector/otlpjsonconnector/go.mod b/connector/otlpjsonconnector/go.mod new file mode 100644 index 000000000000..d2c26a078c65 --- /dev/null +++ b/connector/otlpjsonconnector/go.mod @@ -0,0 +1,58 @@ +module github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector + +go 1.21.0 + +require ( + github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe + go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe + go.opentelemetry.io/collector/connector v0.105.1-0.20240717163034-43ed6184f9fe + go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe + go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b + go.uber.org/goleak v1.3.0 + go.uber.org/zap v1.27.0 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/knadh/koanf/maps v0.1.1 // indirect + github.com/knadh/koanf/providers/confmap v0.1.0 // indirect + github.com/knadh/koanf/v2 v2.1.1 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + 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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe // indirect + go.opentelemetry.io/collector/featuregate v1.12.1-0.20240716231837-5753a58f712b // indirect + go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/connector/otlpjsonconnector/go.sum b/connector/otlpjsonconnector/go.sum new file mode 100644 index 000000000000..1e539cb42628 --- /dev/null +++ b/connector/otlpjsonconnector/go.sum @@ -0,0 +1,148 @@ +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= +github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +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/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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= +github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= +github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +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/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +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/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= +go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:UVapTqB4fJeZpGU/YgOo6665cxCSytqYmMkVmRlu2cg= +go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe h1:arQYi6m+phRUEW9nFRYcDv05oSNtrl3C6CrGej+5AsY= +go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:s8KoxOrhNIBzetkb0LHmzX1OI67DyZbaaUPOWIXS1mg= +go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe h1:PZBUpzjgEarO4SPyO2ZZFJqe9U6gcXCDB1hC8RdKwpE= +go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:WxWKNVAQJg/Io1nA3xLgn/DWLE/W1QOB2+/Js3ACi40= +go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe h1:Bg7JwoNUEyqtC76+z1eMllfkh2ulwRdh7DEOrQVz5kw= +go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:Oj1xUBRvAuL8OWWMj9sSYf1uQpB+AErpj+FKGUQLBI0= +go.opentelemetry.io/collector/connector v0.105.1-0.20240717163034-43ed6184f9fe h1:NImj2SNlGZm6s7YQm3ju5X2KngnkBifa0xrWnPWYM7o= +go.opentelemetry.io/collector/connector v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:xQnq1Ygd/F4Kb93E0UsKus5YDINeyQ6GzCkxoujI9TE= +go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe h1:1zjpbr74nZC11iyihAdCGDIGZTRLW3QYrxpHUQyMheY= +go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:tnaPDHUfKBJ01OnsJNRecniG9iciE+xHYLqamYwFQOQ= +go.opentelemetry.io/collector/featuregate v1.12.1-0.20240716231837-5753a58f712b h1:rH/3mvRHmDdcKtDPZvoFLrIl8317HSHfb0AykJ6bjM8= +go.opentelemetry.io/collector/featuregate v1.12.1-0.20240716231837-5753a58f712b/go.mod h1:PsOINaGgTiFc+Tzu2K/X2jP+Ngmlp7YKGV1XrnBkH7U= +go.opentelemetry.io/collector/internal/globalgates v0.105.0 h1:U/CwnTUXtrblD1sZ6ri7KWfYoTNjQd7GjJKrX/phRik= +go.opentelemetry.io/collector/internal/globalgates v0.105.0/go.mod h1:Z5US6O2xkZAtxVSSBnHAPFZwPhFoxlyKLUvS67Vx4gc= +go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b h1:rrdMHqJ6DCZmPSeQal3cHCDsmgmGt6mClFm5kuXOIME= +go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b/go.mod h1:MYeB0MmMAxeM0hstCFrCqWLzdyeYySim2dG6pDT6nYI= +go.opentelemetry.io/collector/pdata/pprofile v0.105.0 h1:C+Hd7CNcepL/364OBV9f4lHzJil2jQSOxcEM1PFXGDg= +go.opentelemetry.io/collector/pdata/pprofile v0.105.0/go.mod h1:chr7lMJIzyXkccnPRkIPhyXtqLZLSReZYhwsggOGEfg= +go.opentelemetry.io/collector/pdata/testdata v0.105.0 h1:5sPZzanR4nJR3sNQk3MTdArdEZCK0NRAfC29t0Dtf60= +go.opentelemetry.io/collector/pdata/testdata v0.105.0/go.mod h1:NIfgaclQp/M1BZhgyc/7hDWD+/DumC/OMBQVI2KW+N0= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= +go.opentelemetry.io/otel/exporters/prometheus v0.50.0/go.mod h1:pMm5PkUo5YwbLiuEf7t2xg4wbP0/eSJrMxIMxKosynY= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/sdk/metric v1.28.0 h1:OkuaKgKrgAbYrrY0t92c+cC+2F6hsFNnCQArXCKlg08= +go.opentelemetry.io/otel/sdk/metric v1.28.0/go.mod h1:cWPjykihLAPvXKi4iZc1dpER3Jdq2Z0YLse3moQUCpg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= +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.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +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/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +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/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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +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-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +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/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/connector/otlpjsonconnector/internal/metadata/generated_status.go b/connector/otlpjsonconnector/internal/metadata/generated_status.go new file mode 100644 index 000000000000..dd3f763e24db --- /dev/null +++ b/connector/otlpjsonconnector/internal/metadata/generated_status.go @@ -0,0 +1,17 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "go.opentelemetry.io/collector/component" +) + +var ( + Type = component.MustNewType("otlpjson") +) + +const ( + LogsToMetricsStability = component.StabilityLevelDevelopment + LogsToTracesStability = component.StabilityLevelDevelopment + LogsToLogsStability = component.StabilityLevelDevelopment +) diff --git a/connector/otlpjsonconnector/logs.go b/connector/otlpjsonconnector/logs.go new file mode 100644 index 000000000000..4b188f2044e2 --- /dev/null +++ b/connector/otlpjsonconnector/logs.go @@ -0,0 +1,45 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" + +import ( + "context" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/plog" + "go.uber.org/zap" +) + +type connectorLogs struct { + config Config + logsConsumer consumer.Logs + logger *zap.Logger + + component.StartFunc + component.ShutdownFunc +} + +// newLogsConnector is a function to create a new connector for logs extraction +func newLogsConnector(set connector.Settings, config component.Config, logsConsumer consumer.Logs) *connectorLogs { + set.TelemetrySettings.Logger.Info("Building otlpjson connector for logs") + cfg := config.(*Config) + + return &connectorLogs{ + config: *cfg, + logger: set.TelemetrySettings.Logger, + logsConsumer: logsConsumer, + } +} + +// Capabilities implements the consumer interface +func (c *connectorLogs) Capabilities() consumer.Capabilities { + return consumer.Capabilities{MutatesData: false} +} + +// ConsumeLogs method is called for each instance of a log sent to the connector +func (c *connectorLogs) ConsumeLogs(_ context.Context, _ plog.Logs) error { + return nil +} diff --git a/connector/otlpjsonconnector/metadata.yaml b/connector/otlpjsonconnector/metadata.yaml new file mode 100644 index 000000000000..c6927d232eee --- /dev/null +++ b/connector/otlpjsonconnector/metadata.yaml @@ -0,0 +1,9 @@ +type: otlpjson + +status: + class: connector + stability: + development: [logs_to_metrics, logs_to_traces, logs_to_logs] + distributions: [contrib] + codeowners: + active: [djaglowski, ChrsMark] diff --git a/connector/otlpjsonconnector/metrics.go b/connector/otlpjsonconnector/metrics.go new file mode 100644 index 000000000000..892e0012a7f3 --- /dev/null +++ b/connector/otlpjsonconnector/metrics.go @@ -0,0 +1,45 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" + +import ( + "context" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/plog" + "go.uber.org/zap" +) + +type connectorMetrics struct { + config Config + metricsConsumer consumer.Metrics + logger *zap.Logger + + component.StartFunc + component.ShutdownFunc +} + +// newMetricsConnector is a function to create a new connector for metrics extraction +func newMetricsConnector(set connector.Settings, config component.Config, metricsConsumer consumer.Metrics) *connectorMetrics { + set.TelemetrySettings.Logger.Info("Building otlpjson connector for metrics") + cfg := config.(*Config) + + return &connectorMetrics{ + config: *cfg, + logger: set.TelemetrySettings.Logger, + metricsConsumer: metricsConsumer, + } +} + +// Capabilities implements the consumer interface. +func (c *connectorMetrics) Capabilities() consumer.Capabilities { + return consumer.Capabilities{MutatesData: false} +} + +// ConsumeLogs method is called for each instance of a log sent to the connector +func (c *connectorMetrics) ConsumeLogs(_ context.Context, _ plog.Logs) error { + return nil +} diff --git a/connector/otlpjsonconnector/testdata/config.yaml b/connector/otlpjsonconnector/testdata/config.yaml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/connector/otlpjsonconnector/traces.go b/connector/otlpjsonconnector/traces.go new file mode 100644 index 000000000000..54ae939fa048 --- /dev/null +++ b/connector/otlpjsonconnector/traces.go @@ -0,0 +1,45 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" + +import ( + "context" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/plog" + "go.uber.org/zap" +) + +type connectorTraces struct { + config Config + tracesConsumer consumer.Traces + logger *zap.Logger + + component.StartFunc + component.ShutdownFunc +} + +// newTracesConnector is a function to create a new connector for traces extraction +func newTracesConnector(set connector.Settings, config component.Config, tracesConsumer consumer.Traces) *connectorTraces { + set.TelemetrySettings.Logger.Info("Building otlpjson connector for traces") + cfg := config.(*Config) + + return &connectorTraces{ + config: *cfg, + logger: set.TelemetrySettings.Logger, + tracesConsumer: tracesConsumer, + } +} + +// Capabilities implements the consumer interface. +func (c *connectorTraces) Capabilities() consumer.Capabilities { + return consumer.Capabilities{MutatesData: false} +} + +// ConsumeLogs method is called for each instance of a log sent to the connector +func (c *connectorTraces) ConsumeLogs(_ context.Context, _ plog.Logs) error { + return nil +} diff --git a/reports/distributions/contrib.yaml b/reports/distributions/contrib.yaml index ae0c46ab94e7..afebe9fbff42 100644 --- a/reports/distributions/contrib.yaml +++ b/reports/distributions/contrib.yaml @@ -8,6 +8,7 @@ components: - exceptions - failover - grafanacloud + - otlpjson - roundrobin - routing - servicegraph diff --git a/versions.yaml b/versions.yaml index 1f6d1fc058f8..39ad75db67cb 100644 --- a/versions.yaml +++ b/versions.yaml @@ -16,6 +16,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector + - github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector From 074448e22e524fc9a8f6899686f60d0a3995e68b Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Wed, 24 Jul 2024 15:55:20 -0500 Subject: [PATCH 18/30] [chore] Upgrade aerospike dependency to v7.6.0 (#34244) Resolves https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33398 --- cmd/otelcontribcol/go.mod | 4 ++-- cmd/otelcontribcol/go.sum | 20 ++++++++-------- receiver/aerospikereceiver/client.go | 2 +- receiver/aerospikereceiver/client_test.go | 2 +- receiver/aerospikereceiver/cluster/cluster.go | 2 +- .../aerospikereceiver/cluster/cluster_test.go | 2 +- .../cluster/mock_connFactoryFunc.go | 2 +- .../cluster/mock_nodeFactoryFunc.go | 2 +- .../aerospikereceiver/cluster/mocks/Node.go | 2 +- .../cluster/mocks/asclient.go | 2 +- .../aerospikereceiver/cluster/mocks/asconn.go | 2 +- receiver/aerospikereceiver/cluster/node.go | 4 ++-- .../aerospikereceiver/cluster/node_test.go | 2 +- .../cluster/subset_cluster.go | 2 +- .../cluster/subset_cluster_test.go | 2 +- receiver/aerospikereceiver/go.mod | 6 ++--- receiver/aerospikereceiver/go.sum | 24 +++++++++---------- .../aerospikereceiver/integration_test.go | 2 +- receiver/aerospikereceiver/scraper.go | 2 +- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 3c67ee44769d..1cb004a57538 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -376,7 +376,7 @@ require ( github.com/SAP/go-hdb v1.10.1 // indirect github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc // indirect github.com/Showmax/go-fqdn v1.0.0 // indirect - github.com/aerospike/aerospike-client-go/v6 v6.13.0 // indirect + github.com/aerospike/aerospike-client-go/v7 v7.6.0 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect github.com/aliyun/aliyun-log-go-sdk v0.1.80 // indirect @@ -749,7 +749,7 @@ require ( github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect + github.com/yuin/gopher-lua v1.1.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index f6c2e6398488..ac8cb4159b92 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -927,8 +927,8 @@ github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc h1:MhBvG7RLaLq github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc/go.mod h1:ARgCUhI1MHQH+ONky/PAtmVHQrP5JlGY0F3poXOp/fA= github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM= github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko= -github.com/aerospike/aerospike-client-go/v6 v6.13.0 h1:9V5qKtdF2t9hDUKRKU8POUMKtOyw6pkfhHlVI6L32cU= -github.com/aerospike/aerospike-client-go/v6 v6.13.0/go.mod h1:2Syy0n4FKdgJxn0ZCfLfggVdaTXgMaGW6EOlPV6MGG4= +github.com/aerospike/aerospike-client-go/v7 v7.6.0 h1:jAOlsxOaWbmtGzB1yP9x1komh4x14BvCb5HRu5AzVIo= +github.com/aerospike/aerospike-client-go/v7 v7.6.0/go.mod h1:uCbSYMpjlRcH/9f26VSF/luzDDXrcDaV8c6/WIcKtT4= github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY= github.com/ajstarks/deck/generate v0.0.0-20210309230005-c3f852c02e19/go.mod h1:T13YZdzov6OU0A1+RfKZiZN9ca6VeKdBdyDV+BY97Tk= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -1514,8 +1514,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20240528025155-186aa0362fba h1:ql1qNgCyOB7iAEk8JTNM+zJrgIbnyCKX/wdlyPufP5g= -github.com/google/pprof v0.0.0-20240528025155-186aa0362fba/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da h1:xRmpO92tb8y+Z85iUOMOicpCfaYcv7o3Cg3wKrIpg8g= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= @@ -1956,16 +1956,16 @@ github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvw 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 v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= -github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= +github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= +github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 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.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/open-telemetry/opamp-go v0.15.0 h1:X2TWhEsGQ8GP7Uos3Ic9v/1aFUqoECZXKS7xAF5HqsA= github.com/open-telemetry/opamp-go v0.15.0/go.mod h1:QyPeN56JXlcZt5yG5RMdZ50Ju+zMFs1Ihy/hwHyF8Oo= github.com/open-telemetry/otel-arrow v0.24.0 h1:hNUEbwHW/1gEOUiN+HoI+ITiXe2vSBaPWlE9FRwJwDE= @@ -2300,8 +2300,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= -github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= +github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= +github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= diff --git a/receiver/aerospikereceiver/client.go b/receiver/aerospikereceiver/client.go index 07a9474319ba..18991cb0158d 100644 --- a/receiver/aerospikereceiver/client.go +++ b/receiver/aerospikereceiver/client.go @@ -10,7 +10,7 @@ import ( "sync" "time" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster" diff --git a/receiver/aerospikereceiver/client_test.go b/receiver/aerospikereceiver/client_test.go index 9934b3efad5b..9185e6339df8 100644 --- a/receiver/aerospikereceiver/client_test.go +++ b/receiver/aerospikereceiver/client_test.go @@ -6,7 +6,7 @@ package aerospikereceiver // import "github.com/open-telemetry/opentelemetry-col import ( "testing" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "github.com/stretchr/testify/require" "go.uber.org/zap" diff --git a/receiver/aerospikereceiver/cluster/cluster.go b/receiver/aerospikereceiver/cluster/cluster.go index 68bd706bf967..e079097a1e01 100644 --- a/receiver/aerospikereceiver/cluster/cluster.go +++ b/receiver/aerospikereceiver/cluster/cluster.go @@ -3,7 +3,7 @@ package cluster // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster" import ( - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" ) // asclient interface is for mocking diff --git a/receiver/aerospikereceiver/cluster/cluster_test.go b/receiver/aerospikereceiver/cluster/cluster_test.go index 9faf89f5090a..e0ab3677c158 100644 --- a/receiver/aerospikereceiver/cluster/cluster_test.go +++ b/receiver/aerospikereceiver/cluster/cluster_test.go @@ -6,7 +6,7 @@ package cluster // import "github.com/open-telemetry/opentelemetry-collector-con import ( "testing" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "github.com/stretchr/testify/require" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks" diff --git a/receiver/aerospikereceiver/cluster/mock_connFactoryFunc.go b/receiver/aerospikereceiver/cluster/mock_connFactoryFunc.go index 66e1f2a47a75..8a73f16fd43e 100644 --- a/receiver/aerospikereceiver/cluster/mock_connFactoryFunc.go +++ b/receiver/aerospikereceiver/cluster/mock_connFactoryFunc.go @@ -3,7 +3,7 @@ package cluster import ( - aerospike "github.com/aerospike/aerospike-client-go/v6" + aerospike "github.com/aerospike/aerospike-client-go/v7" mock "github.com/stretchr/testify/mock" ) diff --git a/receiver/aerospikereceiver/cluster/mock_nodeFactoryFunc.go b/receiver/aerospikereceiver/cluster/mock_nodeFactoryFunc.go index b5fa9b93c481..562022ef56d6 100644 --- a/receiver/aerospikereceiver/cluster/mock_nodeFactoryFunc.go +++ b/receiver/aerospikereceiver/cluster/mock_nodeFactoryFunc.go @@ -3,7 +3,7 @@ package cluster import ( - aerospike "github.com/aerospike/aerospike-client-go/v6" + aerospike "github.com/aerospike/aerospike-client-go/v7" mock "github.com/stretchr/testify/mock" ) diff --git a/receiver/aerospikereceiver/cluster/mocks/Node.go b/receiver/aerospikereceiver/cluster/mocks/Node.go index 07f96a41aaac..42ce1f13d022 100644 --- a/receiver/aerospikereceiver/cluster/mocks/Node.go +++ b/receiver/aerospikereceiver/cluster/mocks/Node.go @@ -3,7 +3,7 @@ package mocks import ( - aerospike "github.com/aerospike/aerospike-client-go/v6" + aerospike "github.com/aerospike/aerospike-client-go/v7" mock "github.com/stretchr/testify/mock" ) diff --git a/receiver/aerospikereceiver/cluster/mocks/asclient.go b/receiver/aerospikereceiver/cluster/mocks/asclient.go index 8a63b3c5d7db..983fcadb09e5 100644 --- a/receiver/aerospikereceiver/cluster/mocks/asclient.go +++ b/receiver/aerospikereceiver/cluster/mocks/asclient.go @@ -3,7 +3,7 @@ package mocks import ( - aerospike "github.com/aerospike/aerospike-client-go/v6" + aerospike "github.com/aerospike/aerospike-client-go/v7" mock "github.com/stretchr/testify/mock" ) diff --git a/receiver/aerospikereceiver/cluster/mocks/asconn.go b/receiver/aerospikereceiver/cluster/mocks/asconn.go index e57b1c287b10..9a5cca004151 100644 --- a/receiver/aerospikereceiver/cluster/mocks/asconn.go +++ b/receiver/aerospikereceiver/cluster/mocks/asconn.go @@ -5,7 +5,7 @@ package mocks import ( time "time" - aerospike "github.com/aerospike/aerospike-client-go/v6" + aerospike "github.com/aerospike/aerospike-client-go/v7" mock "github.com/stretchr/testify/mock" ) diff --git a/receiver/aerospikereceiver/cluster/node.go b/receiver/aerospikereceiver/cluster/node.go index 362c52829058..ccb3efd5a516 100644 --- a/receiver/aerospikereceiver/cluster/node.go +++ b/receiver/aerospikereceiver/cluster/node.go @@ -7,8 +7,8 @@ import ( "strings" "time" - as "github.com/aerospike/aerospike-client-go/v6" - "github.com/aerospike/aerospike-client-go/v6/types" + as "github.com/aerospike/aerospike-client-go/v7" + "github.com/aerospike/aerospike-client-go/v7/types" ) // asconn is used to mock aerospike connections diff --git a/receiver/aerospikereceiver/cluster/node_test.go b/receiver/aerospikereceiver/cluster/node_test.go index a09b53c989c7..f2cf325acc1e 100644 --- a/receiver/aerospikereceiver/cluster/node_test.go +++ b/receiver/aerospikereceiver/cluster/node_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "github.com/stretchr/testify/require" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks" diff --git a/receiver/aerospikereceiver/cluster/subset_cluster.go b/receiver/aerospikereceiver/cluster/subset_cluster.go index 7af572864d1a..74573e1702d4 100644 --- a/receiver/aerospikereceiver/cluster/subset_cluster.go +++ b/receiver/aerospikereceiver/cluster/subset_cluster.go @@ -3,7 +3,7 @@ package cluster // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster" import ( - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" ) type SubsetCluster struct { diff --git a/receiver/aerospikereceiver/cluster/subset_cluster_test.go b/receiver/aerospikereceiver/cluster/subset_cluster_test.go index 8009c499fbab..a95e7f347d5a 100644 --- a/receiver/aerospikereceiver/cluster/subset_cluster_test.go +++ b/receiver/aerospikereceiver/cluster/subset_cluster_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "github.com/stretchr/testify/require" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver/cluster/mocks" diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index dc601aca8ae2..e387fba50b57 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerosp go 1.21.0 require ( - github.com/aerospike/aerospike-client-go/v6 v6.13.0 + github.com/aerospike/aerospike-client-go/v7 v7.6.0 github.com/docker/go-connections v0.5.0 github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 @@ -84,7 +84,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect + github.com/yuin/gopher-lua v1.1.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe // indirect @@ -102,7 +102,7 @@ require ( golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 51cf20d8219a..b3079c3bde8a 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -8,8 +8,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= -github.com/aerospike/aerospike-client-go/v6 v6.13.0 h1:9V5qKtdF2t9hDUKRKU8POUMKtOyw6pkfhHlVI6L32cU= -github.com/aerospike/aerospike-client-go/v6 v6.13.0/go.mod h1:2Syy0n4FKdgJxn0ZCfLfggVdaTXgMaGW6EOlPV6MGG4= +github.com/aerospike/aerospike-client-go/v7 v7.6.0 h1:jAOlsxOaWbmtGzB1yP9x1komh4x14BvCb5HRu5AzVIo= +github.com/aerospike/aerospike-client-go/v7 v7.6.0/go.mod h1:uCbSYMpjlRcH/9f26VSF/luzDDXrcDaV8c6/WIcKtT4= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -56,8 +56,8 @@ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da h1:xRmpO92tb8y+Z85iUOMOicpCfaYcv7o3Cg3wKrIpg8g= +github.com/google/pprof v0.0.0-20240711041743-f6c9dda6c6da/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= @@ -107,10 +107,10 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.7 h1:06xGQy5www2oN160RtEZoTvnP2sPhEfePYmCDc2szss= -github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= +github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= +github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= 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 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -154,8 +154,8 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= 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/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRFc9q3yYbBkB6tsm4aCwwQV/j1JQAQ= -github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= +github.com/yuin/gopher-lua v1.1.1 h1:kYKnWBjvbNP4XLT3+bPEwAXJx262OhaHDWDVOPjL46M= +github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe h1:ZjgqZsb2G6DekoePCEUmr1Mh3dbiSo5fTODlsCwyhPg= @@ -264,8 +264,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 h1:Z0hjGZePRE0ZBWotvtrwxFNrNE9CUAGtplaDK5NNI/g= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= diff --git a/receiver/aerospikereceiver/integration_test.go b/receiver/aerospikereceiver/integration_test.go index 60d5da363467..b77b4c6b1b36 100644 --- a/receiver/aerospikereceiver/integration_test.go +++ b/receiver/aerospikereceiver/integration_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "github.com/docker/go-connections/nat" "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" diff --git a/receiver/aerospikereceiver/scraper.go b/receiver/aerospikereceiver/scraper.go index 8357e57435d3..ba421a565b6d 100644 --- a/receiver/aerospikereceiver/scraper.go +++ b/receiver/aerospikereceiver/scraper.go @@ -11,7 +11,7 @@ import ( "strconv" "time" - as "github.com/aerospike/aerospike-client-go/v6" + as "github.com/aerospike/aerospike-client-go/v7" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/pcommon" From 1c06ffb768af694289e7985e926bbcd39a3d9999 Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:24:56 -0400 Subject: [PATCH 19/30] Add @BinaryFissionGames as a code owner of Collector OpAMP modules (#34243) --- .github/CODEOWNERS | 4 ++-- cmd/opampsupervisor/metadata.yaml | 2 +- extension/opampextension/README.md | 2 +- extension/opampextension/metadata.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c254063358bd..55f397978443 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,7 +16,7 @@ * @open-telemetry/collector-contrib-approvers cmd/githubgen/ @open-telemetry/collector-contrib-approvers @atoulme -cmd/opampsupervisor/ @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan +cmd/opampsupervisor/ @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan @BinaryFissionGames cmd/otelcontribcol/ @open-telemetry/collector-contrib-approvers cmd/oteltestbedcol/ @open-telemetry/collector-contrib-approvers cmd/telemetrygen/ @open-telemetry/collector-contrib-approvers @mx-psi @codeboten @@ -112,7 +112,7 @@ extension/observer/hostobserver/ @open-teleme extension/observer/k8sobserver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick @dmitryax extension/oidcauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling extension/opampcustommessages/ @open-telemetry/collector-contrib-approvers @BinaryFissionGames @evan-bradley -extension/opampextension/ @open-telemetry/collector-contrib-approvers @portertech @evan-bradley @tigrannajaryan +extension/opampextension/ @open-telemetry/collector-contrib-approvers @portertech @evan-bradley @tigrannajaryan @BinaryFissionGames extension/pprofextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy extension/remotetapextension/ @open-telemetry/collector-contrib-approvers @atoulme extension/sigv4authextension/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @erichsueh3 diff --git a/cmd/opampsupervisor/metadata.yaml b/cmd/opampsupervisor/metadata.yaml index 097313f86fb0..2dad4cdda1da 100644 --- a/cmd/opampsupervisor/metadata.yaml +++ b/cmd/opampsupervisor/metadata.yaml @@ -3,4 +3,4 @@ type: opampsupervisor status: class: cmd codeowners: - active: [evan-bradley, atoulme, tigrannajaryan] \ No newline at end of file + active: [evan-bradley, atoulme, tigrannajaryan, BinaryFissionGames] diff --git a/extension/opampextension/README.md b/extension/opampextension/README.md index 8b3797b4705c..920d60ab91d3 100644 --- a/extension/opampextension/README.md +++ b/extension/opampextension/README.md @@ -5,7 +5,7 @@ | Stability | [alpha] | | Distributions | [contrib] | | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fopamp%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fopamp) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fopamp%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fopamp) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@portertech](https://www.github.com/portertech), [@evan-bradley](https://www.github.com/evan-bradley), [@tigrannajaryan](https://www.github.com/tigrannajaryan) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@portertech](https://www.github.com/portertech), [@evan-bradley](https://www.github.com/evan-bradley), [@tigrannajaryan](https://www.github.com/tigrannajaryan), [@BinaryFissionGames](https://www.github.com/BinaryFissionGames) | [alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib diff --git a/extension/opampextension/metadata.yaml b/extension/opampextension/metadata.yaml index 99944a1fee1a..d7f7c9018cc3 100644 --- a/extension/opampextension/metadata.yaml +++ b/extension/opampextension/metadata.yaml @@ -7,7 +7,7 @@ status: alpha: [extension] distributions: [contrib] codeowners: - active: [portertech, evan-bradley, tigrannajaryan] + active: [portertech, evan-bradley, tigrannajaryan, BinaryFissionGames] tests: config: From 3cb736bbb52efb4911234bfd40f7bc786b5eac40 Mon Sep 17 00:00:00 2001 From: Christos Markou Date: Thu, 25 Jul 2024 16:28:54 +0300 Subject: [PATCH 20/30] [connector/otlpjson] Add connector's implementations (#34249) **Description:** This is the 2nd PR for the new `otlpjson` connector (https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208). Adds the `ConsumeLogs` methods for the logs, metrics and traces respective connector types. At the moment, the connector retrieves the otlp json from the incoming Log's `Body`. This is not configurable yet. It can be decided if that needs to be. In addition, there is no attribute/metadata extraction/transfer from the incoming Log. This can be added in future iterations. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34239 **Testing:** Added. **Documentation:** ~ Signed-off-by: ChrsMark --- .chloggen/implement_oltpjson_connector.yaml | 27 ++++++ connector/otlpjsonconnector/factory_test.go | 97 +++++++++++++++++++++ connector/otlpjsonconnector/go.mod | 2 + connector/otlpjsonconnector/logs.go | 20 ++++- connector/otlpjsonconnector/metrics.go | 21 ++++- connector/otlpjsonconnector/traces.go | 21 ++++- 6 files changed, 185 insertions(+), 3 deletions(-) create mode 100644 .chloggen/implement_oltpjson_connector.yaml diff --git a/.chloggen/implement_oltpjson_connector.yaml b/.chloggen/implement_oltpjson_connector.yaml new file mode 100644 index 000000000000..8967fc7196a8 --- /dev/null +++ b/.chloggen/implement_oltpjson_connector.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: otlpjsonconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add connector's implementations + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34249, 34208] + +# (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/connector/otlpjsonconnector/factory_test.go b/connector/otlpjsonconnector/factory_test.go index 8a8c9f5578f8..0c0b1499fadb 100644 --- a/connector/otlpjsonconnector/factory_test.go +++ b/connector/otlpjsonconnector/factory_test.go @@ -6,11 +6,18 @@ package otlpjsonconnector import ( "context" "testing" + "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.opentelemetry.io/collector/pdata/ptrace" + "go.opentelemetry.io/collector/pdata/testdata" ) func TestNewFactory(t *testing.T) { @@ -28,3 +35,93 @@ func TestNewFactory(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, conn) } + +func TestLogsToLogs(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + + sink := &consumertest.LogsSink{} + conn, err := factory.CreateLogsToLogs(context.Background(), + connectortest.NewNopSettings(), cfg, sink) + require.NoError(t, err) + require.NotNil(t, conn) + assert.False(t, conn.Capabilities().MutatesData) + + require.NoError(t, conn.Start(context.Background(), componenttest.NewNopHost())) + defer func() { + assert.NoError(t, conn.Shutdown(context.Background())) + }() + + lp := testdata.GenerateLogs(1) + marshaler := &plog.JSONMarshaler{} + b, err := marshaler.MarshalLogs(lp) + require.NoError(t, err) + + testLogs := testdata.GenerateLogs(1) + testLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetStr(string(b)) + assert.NoError(t, conn.ConsumeLogs(context.Background(), testLogs)) + + time.Sleep(1 * time.Second) + require.Len(t, sink.AllLogs(), 1) + assert.EqualValues(t, lp, sink.AllLogs()[0]) +} + +func TestLogsToMetrics(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + + sink := &consumertest.MetricsSink{} + conn, err := factory.CreateLogsToMetrics(context.Background(), + connectortest.NewNopSettings(), cfg, sink) + require.NoError(t, err) + require.NotNil(t, conn) + assert.False(t, conn.Capabilities().MutatesData) + + require.NoError(t, conn.Start(context.Background(), componenttest.NewNopHost())) + defer func() { + assert.NoError(t, conn.Shutdown(context.Background())) + }() + + mt := testdata.GenerateMetrics(1) + marshaler := &pmetric.JSONMarshaler{} + b, err := marshaler.MarshalMetrics(mt) + require.NoError(t, err) + + testLogs := testdata.GenerateLogs(1) + testLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetStr(string(b)) + assert.NoError(t, conn.ConsumeLogs(context.Background(), testLogs)) + + time.Sleep(1 * time.Second) + require.Len(t, sink.AllMetrics(), 1) + assert.EqualValues(t, mt, sink.AllMetrics()[0]) +} + +func TestLogsToTraces(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + + sink := &consumertest.TracesSink{} + conn, err := factory.CreateLogsToTraces(context.Background(), + connectortest.NewNopSettings(), cfg, sink) + require.NoError(t, err) + require.NotNil(t, conn) + assert.False(t, conn.Capabilities().MutatesData) + + require.NoError(t, conn.Start(context.Background(), componenttest.NewNopHost())) + defer func() { + assert.NoError(t, conn.Shutdown(context.Background())) + }() + + td := testdata.GenerateTraces(1) + marshaler := &ptrace.JSONMarshaler{} + b, err := marshaler.MarshalTraces(td) + require.NoError(t, err) + + testLogs := testdata.GenerateLogs(1) + testLogs.ResourceLogs().At(0).ScopeLogs().At(0).LogRecords().At(0).Body().SetStr(string(b)) + assert.NoError(t, conn.ConsumeLogs(context.Background(), testLogs)) + + time.Sleep(1 * time.Second) + require.Len(t, sink.AllTraces(), 1) + assert.EqualValues(t, td, sink.AllTraces()[0]) +} diff --git a/connector/otlpjsonconnector/go.mod b/connector/otlpjsonconnector/go.mod index d2c26a078c65..1dd91758e09f 100644 --- a/connector/otlpjsonconnector/go.mod +++ b/connector/otlpjsonconnector/go.mod @@ -9,6 +9,7 @@ require ( go.opentelemetry.io/collector/connector v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b + go.opentelemetry.io/collector/pdata/testdata v0.105.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -41,6 +42,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/collector/featuregate v1.12.1-0.20240716231837-5753a58f712b // indirect go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.105.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect diff --git a/connector/otlpjsonconnector/logs.go b/connector/otlpjsonconnector/logs.go index 4b188f2044e2..32e7149b7327 100644 --- a/connector/otlpjsonconnector/logs.go +++ b/connector/otlpjsonconnector/logs.go @@ -40,6 +40,24 @@ func (c *connectorLogs) Capabilities() consumer.Capabilities { } // ConsumeLogs method is called for each instance of a log sent to the connector -func (c *connectorLogs) ConsumeLogs(_ context.Context, _ plog.Logs) error { +func (c *connectorLogs) ConsumeLogs(ctx context.Context, pl plog.Logs) error { + // loop through the levels of logs + logsUnmarshaler := &plog.JSONUnmarshaler{} + for i := 0; i < pl.ResourceLogs().Len(); i++ { + li := pl.ResourceLogs().At(i) + for j := 0; j < li.ScopeLogs().Len(); j++ { + logRecord := li.ScopeLogs().At(j) + for k := 0; k < logRecord.LogRecords().Len(); k++ { + lRecord := logRecord.LogRecords().At(k) + token := lRecord.Body() + var l plog.Logs + l, _ = logsUnmarshaler.UnmarshalLogs([]byte(token.AsString())) + err := c.logsConsumer.ConsumeLogs(ctx, l) + if err != nil { + c.logger.Error("could not extract logs from otlp json", zap.Error(err)) + } + } + } + } return nil } diff --git a/connector/otlpjsonconnector/metrics.go b/connector/otlpjsonconnector/metrics.go index 892e0012a7f3..9b9cd1b1de90 100644 --- a/connector/otlpjsonconnector/metrics.go +++ b/connector/otlpjsonconnector/metrics.go @@ -10,6 +10,7 @@ import ( "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" ) @@ -40,6 +41,24 @@ func (c *connectorMetrics) Capabilities() consumer.Capabilities { } // ConsumeLogs method is called for each instance of a log sent to the connector -func (c *connectorMetrics) ConsumeLogs(_ context.Context, _ plog.Logs) error { +func (c *connectorMetrics) ConsumeLogs(ctx context.Context, pl plog.Logs) error { + // loop through the levels of logs + metricsUnmarshaler := &pmetric.JSONUnmarshaler{} + for i := 0; i < pl.ResourceLogs().Len(); i++ { + li := pl.ResourceLogs().At(i) + for j := 0; j < li.ScopeLogs().Len(); j++ { + logRecord := li.ScopeLogs().At(j) + for k := 0; k < logRecord.LogRecords().Len(); k++ { + lRecord := logRecord.LogRecords().At(k) + token := lRecord.Body() + var m pmetric.Metrics + m, _ = metricsUnmarshaler.UnmarshalMetrics([]byte(token.AsString())) + err := c.metricsConsumer.ConsumeMetrics(ctx, m) + if err != nil { + c.logger.Error("could not extract metrics from otlp json", zap.Error(err)) + } + } + } + } return nil } diff --git a/connector/otlpjsonconnector/traces.go b/connector/otlpjsonconnector/traces.go index 54ae939fa048..7c2e0d6ba429 100644 --- a/connector/otlpjsonconnector/traces.go +++ b/connector/otlpjsonconnector/traces.go @@ -10,6 +10,7 @@ import ( "go.opentelemetry.io/collector/connector" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/pdata/plog" + "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" ) @@ -40,6 +41,24 @@ func (c *connectorTraces) Capabilities() consumer.Capabilities { } // ConsumeLogs method is called for each instance of a log sent to the connector -func (c *connectorTraces) ConsumeLogs(_ context.Context, _ plog.Logs) error { +func (c *connectorTraces) ConsumeLogs(ctx context.Context, pl plog.Logs) error { + // loop through the levels of logs + tracesUnmarshaler := &ptrace.JSONUnmarshaler{} + for i := 0; i < pl.ResourceLogs().Len(); i++ { + li := pl.ResourceLogs().At(i) + for j := 0; j < li.ScopeLogs().Len(); j++ { + logRecord := li.ScopeLogs().At(j) + for k := 0; k < logRecord.LogRecords().Len(); k++ { + lRecord := logRecord.LogRecords().At(k) + token := lRecord.Body() + var t ptrace.Traces + t, _ = tracesUnmarshaler.UnmarshalTraces([]byte(token.AsString())) + err := c.tracesConsumer.ConsumeTraces(ctx, t) + if err != nil { + c.logger.Error("could not extract traces from otlp json", zap.Error(err)) + } + } + } + } return nil } From 1f88246b51ffc200092d895d771f4ca230711a1c Mon Sep 17 00:00:00 2001 From: Florian Bacher Date: Thu, 25 Jul 2024 18:16:50 +0200 Subject: [PATCH 21/30] [pkg/ottl] Add support for scaling values (#33246) **Description:** Adds a `Scale` function to the OTTL package. This function can be applied to `int`/`double` values, as well as metrics of the following types: - Sum - Gauge - Histogram **Link to tracking Issue:** #16214 **Testing:** Added Unit and E2E tests in the OTTL package. Tested manually in a sample environment with the following example configuration: ``` receivers: otlp: protocols: grpc: endpoint: 0.0.0.0:4317 processors: transform: error_mode: ignore metric_statements: - context: metric statements: - set(data_points, Scale(data_points, 10.0)) exporters: debug: verbosity: detailed otlphttp: endpoint: "######" headers: Authorization: "#####" service: pipelines: metrics: receivers: [otlp] exporters: [otlphttp, debug] processors: [transform] ``` **Documentation:** Added documentation in the `README` describing all functions in the `ottl` package --------- Signed-off-by: Florian Bacher Co-authored-by: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Co-authored-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- .chloggen/add-scale-function.yaml | 27 +++ processor/transformprocessor/README.md | 16 ++ .../internal/metrics/func_scale.go | 130 +++++++++++ .../internal/metrics/func_scale_test.go | 204 ++++++++++++++++++ .../internal/metrics/functions.go | 1 + .../internal/metrics/functions_test.go | 1 + .../internal/metrics/processor_test.go | 15 ++ 7 files changed, 394 insertions(+) create mode 100644 .chloggen/add-scale-function.yaml create mode 100644 processor/transformprocessor/internal/metrics/func_scale.go create mode 100644 processor/transformprocessor/internal/metrics/func_scale_test.go diff --git a/.chloggen/add-scale-function.yaml b/.chloggen/add-scale-function.yaml new file mode 100644 index 000000000000..202fecf42883 --- /dev/null +++ b/.chloggen/add-scale-function.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: processor/transform + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add `scale_metric` function that scales all data points in a metric. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [16214] + +# (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/transformprocessor/README.md b/processor/transformprocessor/README.md index daab05325aec..f823e018c2bb 100644 --- a/processor/transformprocessor/README.md +++ b/processor/transformprocessor/README.md @@ -212,6 +212,7 @@ In addition to OTTL functions, the processor defines its own functions to help w - [convert_summary_count_val_to_sum](#convert_summary_count_val_to_sum) - [convert_summary_sum_val_to_sum](#convert_summary_sum_val_to_sum) - [copy_metric](#copy_metric) +- [scale_metric](#scale_metric) ### convert_sum_to_gauge @@ -347,6 +348,21 @@ Examples: - `copy_metric(desc="new desc") where description == "old desc"` +### scale_metric + +`scale_metric(factor, Optional[unit])` + +The `scale_metric` function multiplies the values in the data points in the metric by the float value `factor`. +If the optional string `unit` is provided, the metric's unit will be set to this value. +The supported data types are: + +Supported metric types are `Gauge`, `Sum`, `Histogram`, and `Summary`. + +Examples: + +- `scale_metric(0.1)`: Scale the metric by a factor of `0.1`. The unit of the metric will not be modified. +- `scale_metric(10.0, "kWh")`: Scale the metric by a factor of `10.0` and sets the unit to `kWh`. + ## Examples ### Perform transformation if field does not exist diff --git a/processor/transformprocessor/internal/metrics/func_scale.go b/processor/transformprocessor/internal/metrics/func_scale.go new file mode 100644 index 000000000000..60ad4305db9b --- /dev/null +++ b/processor/transformprocessor/internal/metrics/func_scale.go @@ -0,0 +1,130 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package metrics // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor/internal/metrics" + +import ( + "context" + "errors" + "fmt" + + "go.opentelemetry.io/collector/pdata/pmetric" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlmetric" +) + +type ScaleArguments struct { + Multiplier float64 + Unit ottl.Optional[ottl.StringGetter[ottlmetric.TransformContext]] +} + +func newScaleMetricFactory() ottl.Factory[ottlmetric.TransformContext] { + return ottl.NewFactory("scale_metric", &ScaleArguments{}, createScaleFunction) +} + +func createScaleFunction(_ ottl.FunctionContext, oArgs ottl.Arguments) (ottl.ExprFunc[ottlmetric.TransformContext], error) { + args, ok := oArgs.(*ScaleArguments) + + if !ok { + return nil, fmt.Errorf("ScaleFactory args must be of type *ScaleArguments[K]") + } + + return Scale(*args) +} + +func Scale(args ScaleArguments) (ottl.ExprFunc[ottlmetric.TransformContext], error) { + return func(ctx context.Context, tCtx ottlmetric.TransformContext) (any, error) { + metric := tCtx.GetMetric() + + var unit *string + if !args.Unit.IsEmpty() { + u, err := args.Unit.Get().Get(ctx, tCtx) + if err != nil { + return nil, fmt.Errorf("could not get unit from ScaleArguments: %w", err) + } + unit = &u + } + + switch metric.Type() { + case pmetric.MetricTypeGauge: + scaleMetric(metric.Gauge().DataPoints(), args.Multiplier) + case pmetric.MetricTypeHistogram: + scaleHistogram(metric.Histogram().DataPoints(), args.Multiplier) + case pmetric.MetricTypeSummary: + scaleSummarySlice(metric.Summary().DataPoints(), args.Multiplier) + case pmetric.MetricTypeSum: + scaleMetric(metric.Sum().DataPoints(), args.Multiplier) + case pmetric.MetricTypeExponentialHistogram: + return nil, errors.New("exponential histograms are not supported by the 'scale_metric' function") + default: + return nil, fmt.Errorf("unsupported metric type: '%v'", metric.Type()) + } + if unit != nil { + metric.SetUnit(*unit) + } + + return nil, nil + }, nil +} + +func scaleExemplar(ex *pmetric.Exemplar, multiplier float64) { + switch ex.ValueType() { + case pmetric.ExemplarValueTypeInt: + ex.SetIntValue(int64(float64(ex.IntValue()) * multiplier)) + case pmetric.ExemplarValueTypeDouble: + ex.SetDoubleValue(ex.DoubleValue() * multiplier) + } +} + +func scaleSummarySlice(values pmetric.SummaryDataPointSlice, multiplier float64) { + for i := 0; i < values.Len(); i++ { + dp := values.At(i) + + dp.SetSum(dp.Sum() * multiplier) + + for i := 0; i < dp.QuantileValues().Len(); i++ { + qv := dp.QuantileValues().At(i) + qv.SetValue(qv.Value() * multiplier) + } + } +} + +func scaleHistogram(datapoints pmetric.HistogramDataPointSlice, multiplier float64) { + for i := 0; i < datapoints.Len(); i++ { + dp := datapoints.At(i) + + if dp.HasSum() { + dp.SetSum(dp.Sum() * multiplier) + } + if dp.HasMin() { + dp.SetMin(dp.Min() * multiplier) + } + if dp.HasMax() { + dp.SetMax(dp.Max() * multiplier) + } + + for bounds, bi := dp.ExplicitBounds(), 0; bi < bounds.Len(); bi++ { + bounds.SetAt(bi, bounds.At(bi)*multiplier) + } + + for exemplars, ei := dp.Exemplars(), 0; ei < exemplars.Len(); ei++ { + exemplar := exemplars.At(ei) + scaleExemplar(&exemplar, multiplier) + } + } +} + +func scaleMetric(points pmetric.NumberDataPointSlice, multiplier float64) { + for i := 0; i < points.Len(); i++ { + dp := points.At(i) + switch dp.ValueType() { + case pmetric.NumberDataPointValueTypeInt: + dp.SetIntValue(int64(float64(dp.IntValue()) * multiplier)) + + case pmetric.NumberDataPointValueTypeDouble: + dp.SetDoubleValue(dp.DoubleValue() * multiplier) + default: + } + } +} diff --git a/processor/transformprocessor/internal/metrics/func_scale_test.go b/processor/transformprocessor/internal/metrics/func_scale_test.go new file mode 100644 index 000000000000..29441bb047fb --- /dev/null +++ b/processor/transformprocessor/internal/metrics/func_scale_test.go @@ -0,0 +1,204 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package metrics + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottlmetric" +) + +func TestScale(t *testing.T) { + type testCase struct { + name string + args ScaleArguments + valueFunc func() pmetric.Metric + wantFunc func() pmetric.Metric + wantErr bool + } + tests := []testCase{ + { + name: "scale gauge float metric", + valueFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptyGauge() + metric.Gauge().DataPoints().AppendEmpty().SetDoubleValue(10.0) + + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + Unit: ottl.NewTestingOptional[ottl.StringGetter[ottlmetric.TransformContext]](ottl.StandardStringGetter[ottlmetric.TransformContext]{ + Getter: func(_ context.Context, _ ottlmetric.TransformContext) (any, error) { + return "kWh", nil + }, + }), + }, + wantFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptyGauge() + metric.SetUnit("kWh") + metric.Gauge().DataPoints().AppendEmpty().SetDoubleValue(100.0) + + return metric + }, + wantErr: false, + }, + { + name: "scale gauge int metric", + valueFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptyGauge() + metric.Gauge().DataPoints().AppendEmpty().SetIntValue(10) + + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + }, + wantFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptyGauge() + metric.Gauge().DataPoints().AppendEmpty().SetIntValue(100.0) + + return metric + }, + wantErr: false, + }, + { + name: "scale sum metric", + valueFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptySum() + metric.Sum().DataPoints().AppendEmpty().SetDoubleValue(10.0) + + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + }, + wantFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptySum() + metric.Sum().DataPoints().AppendEmpty().SetDoubleValue(100.0) + + return metric + }, + wantErr: false, + }, + { + name: "scale histogram metric", + valueFunc: func() pmetric.Metric { + metric := getTestScalingHistogramMetric(1, 4, 1, 3, []float64{1, 10}, []uint64{1, 2}, []float64{1.0}, 1, 1) + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + }, + wantFunc: func() pmetric.Metric { + metric := getTestScalingHistogramMetric(1, 40, 10, 30, []float64{10, 100}, []uint64{1, 2}, []float64{10.0}, 1, 1) + return metric + }, + wantErr: false, + }, + { + name: "scale summary metric", + valueFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + dp := metric.SetEmptySummary().DataPoints().AppendEmpty() + dp.SetSum(10.0) + qv := dp.QuantileValues().AppendEmpty() + qv.SetValue(10.0) + + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + }, + wantFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + dp := metric.SetEmptySummary().DataPoints().AppendEmpty() + dp.SetSum(100.0) + qv := dp.QuantileValues().AppendEmpty() + qv.SetValue(100.0) + + return metric + }, + wantErr: false, + }, + { + name: "unsupported: exponential histogram metric", + valueFunc: func() pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetEmptyExponentialHistogram() + return metric + }, + args: ScaleArguments{ + Multiplier: 10.0, + }, + wantFunc: func() pmetric.Metric { + // value should not be modified + metric := pmetric.NewMetric() + metric.SetEmptyExponentialHistogram() + return metric + }, + wantErr: true, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + target := ottlmetric.NewTransformContext( + tt.valueFunc(), + pmetric.NewMetricSlice(), + pcommon.NewInstrumentationScope(), + pcommon.NewResource(), + pmetric.NewScopeMetrics(), + pmetric.NewResourceMetrics(), + ) + + expressionFunc, _ := Scale(tt.args) + _, err := expressionFunc(context.Background(), target) + + if tt.wantErr { + assert.Error(t, err) + } else { + assert.NoError(t, err) + } + assert.EqualValues(t, tt.wantFunc(), target.GetMetric()) + }) + } +} + +func getTestScalingHistogramMetric(count uint64, sum, min, max float64, bounds []float64, bucketCounts []uint64, exemplars []float64, start, timestamp pcommon.Timestamp) pmetric.Metric { + metric := pmetric.NewMetric() + metric.SetName("test-metric") + metric.SetEmptyHistogram() + histogramDatapoint := metric.Histogram().DataPoints().AppendEmpty() + histogramDatapoint.SetCount(count) + histogramDatapoint.SetSum(sum) + histogramDatapoint.SetMin(min) + histogramDatapoint.SetMax(max) + histogramDatapoint.ExplicitBounds().FromRaw(bounds) + histogramDatapoint.BucketCounts().FromRaw(bucketCounts) + for i := 0; i < len(exemplars); i++ { + exemplar := histogramDatapoint.Exemplars().AppendEmpty() + exemplar.SetTimestamp(1) + exemplar.SetDoubleValue(exemplars[i]) + } + histogramDatapoint.SetStartTimestamp(start) + histogramDatapoint.SetTimestamp(timestamp) + return metric +} diff --git a/processor/transformprocessor/internal/metrics/functions.go b/processor/transformprocessor/internal/metrics/functions.go index 162e208c362a..18c7b460f198 100644 --- a/processor/transformprocessor/internal/metrics/functions.go +++ b/processor/transformprocessor/internal/metrics/functions.go @@ -49,6 +49,7 @@ func MetricFunctions() map[string]ottl.Factory[ottlmetric.TransformContext] { newExtractSumMetricFactory(), newExtractCountMetricFactory(), newCopyMetricFactory(), + newScaleMetricFactory(), ) if useConvertBetweenSumAndGaugeMetricContext.IsEnabled() { diff --git a/processor/transformprocessor/internal/metrics/functions_test.go b/processor/transformprocessor/internal/metrics/functions_test.go index ec8b09743c7f..60ef54812c91 100644 --- a/processor/transformprocessor/internal/metrics/functions_test.go +++ b/processor/transformprocessor/internal/metrics/functions_test.go @@ -37,6 +37,7 @@ func Test_MetricFunctions(t *testing.T) { expected["extract_sum_metric"] = newExtractSumMetricFactory() expected["extract_count_metric"] = newExtractCountMetricFactory() expected["copy_metric"] = newCopyMetricFactory() + expected["scale_metric"] = newScaleMetricFactory() defer testutil.SetFeatureGateForTest(t, useConvertBetweenSumAndGaugeMetricContext, true)() actual := MetricFunctions() diff --git a/processor/transformprocessor/internal/metrics/processor_test.go b/processor/transformprocessor/internal/metrics/processor_test.go index 03f0b31de2a5..69c250aea76a 100644 --- a/processor/transformprocessor/internal/metrics/processor_test.go +++ b/processor/transformprocessor/internal/metrics/processor_test.go @@ -200,6 +200,21 @@ func Test_ProcessMetrics_MetricContext(t *testing.T) { newMetric.SetUnit("s") }, }, + { + statements: []string{`scale_metric(10.0,"s") where name == "operationA"`}, + want: func(td pmetric.Metrics) { + td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).SetDoubleValue(10.0) + td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(1).SetDoubleValue(37.0) + td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).SetUnit("s") + }, + }, + { + statements: []string{`scale_metric(10.0) where name == "operationA"`}, + want: func(td pmetric.Metrics) { + td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).SetDoubleValue(10.0) + td.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(1).SetDoubleValue(37.0) + }, + }, } for _, tt := range tests { From 59c0c543562df3a9aabf13a4eebc36614ea572a8 Mon Sep 17 00:00:00 2001 From: Stefan Kurek Date: Thu, 25 Jul 2024 13:46:23 -0400 Subject: [PATCH 22/30] [receiver/vcenter] Destroys ContainerViews in client after use (#34254) **Description:** Destroys ContainerViews in client calls after their use. Not sure if necessary, but should be better to do this than not. **Link to tracking Issue:** NA **Testing:** Unit tests run. Integration tests run. Test against live environment. **Documentation:** None needed --- ...centerreceiver_destroy_containerviews.yaml | 27 +++++++++++++++++++ receiver/vcenterreceiver/client.go | 6 +++++ 2 files changed, 33 insertions(+) create mode 100644 .chloggen/vcenterreceiver_destroy_containerviews.yaml diff --git a/.chloggen/vcenterreceiver_destroy_containerviews.yaml b/.chloggen/vcenterreceiver_destroy_containerviews.yaml new file mode 100644 index 000000000000..030034bbab61 --- /dev/null +++ b/.chloggen/vcenterreceiver_destroy_containerviews.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: vcenterreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adds destroys to the ContainerViews in the client. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34254] + +# (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 may not be necessary, but it should be better practice than not. + +# 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/receiver/vcenterreceiver/client.go b/receiver/vcenterreceiver/client.go index 3a5dfd4b1cf9..ea4b873aab10 100644 --- a/receiver/vcenterreceiver/client.go +++ b/receiver/vcenterreceiver/client.go @@ -91,6 +91,7 @@ func (vc *vcenterClient) Datacenters(ctx context.Context) ([]mo.Datacenter, erro if err != nil { return nil, fmt.Errorf("unable to retrieve Datacenters: %w", err) } + defer func() { _ = v.Destroy(ctx) }() var datacenters []mo.Datacenter err = v.Retrieve(ctx, []string{"Datacenter"}, []string{ @@ -109,6 +110,7 @@ func (vc *vcenterClient) Datastores(ctx context.Context, containerMoRef vt.Manag if err != nil { return nil, fmt.Errorf("unable to retrieve Datastores: %w", err) } + defer func() { _ = v.Destroy(ctx) }() var datastores []mo.Datastore err = v.Retrieve(ctx, []string{"Datastore"}, []string{ @@ -129,6 +131,7 @@ func (vc *vcenterClient) ComputeResources(ctx context.Context, containerMoRef vt if err != nil { return nil, fmt.Errorf("unable to retrieve ComputeResources (& ClusterComputeResources): %w", err) } + defer func() { _ = v.Destroy(ctx) }() var computes []mo.ComputeResource err = v.Retrieve(ctx, []string{"ComputeResource"}, []string{ @@ -150,6 +153,7 @@ func (vc *vcenterClient) HostSystems(ctx context.Context, containerMoRef vt.Mana if err != nil { return nil, fmt.Errorf("unable to retrieve HostSystems: %w", err) } + defer func() { _ = v.Destroy(ctx) }() var hosts []mo.HostSystem err = v.Retrieve(ctx, []string{"HostSystem"}, []string{ @@ -177,6 +181,7 @@ func (vc *vcenterClient) ResourcePools(ctx context.Context, containerMoRef vt.Ma if err != nil { return nil, fmt.Errorf("unable to retrieve ResourcePools (&VirtualApps): %w", err) } + defer func() { _ = v.Destroy(ctx) }() var rps []mo.ResourcePool err = v.Retrieve(ctx, []string{"ResourcePool"}, []string{ @@ -198,6 +203,7 @@ func (vc *vcenterClient) VMs(ctx context.Context, containerMoRef vt.ManagedObjec if err != nil { return nil, fmt.Errorf("unable to retrieve VMs: %w", err) } + defer func() { _ = v.Destroy(ctx) }() var vms []mo.VirtualMachine err = v.Retrieve(ctx, []string{"VirtualMachine"}, []string{ From f85b0e37841291b0117b10ffd9acb92b3881f43b Mon Sep 17 00:00:00 2001 From: Florian Bacher Date: Thu, 25 Jul 2024 19:46:50 +0200 Subject: [PATCH 23/30] [pkg/ottl] support top level array values in `ParseJSON` function (#33908) **Description:** This PR enables the `ParseJSON` function to also handle top level arrays. **Link to tracking Issue:** #33535 **Testing:** Added unit and e2e tests **Documentation:** Adapted the documentation of the `ParseJSON` function to indicate that this can either return a `pcommon.Map` or `pcommon.Slice` value --------- Signed-off-by: Florian Bacher --- .chloggen/ottl-parse-json-array.yaml | 27 ++++++++ pkg/ottl/e2e/e2e_test.go | 8 +++ pkg/ottl/ottlfuncs/README.md | 5 +- pkg/ottl/ottlfuncs/func_parse_json.go | 19 +++-- pkg/ottl/ottlfuncs/func_parse_json_test.go | 81 +++++++++++++++------- 5 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 .chloggen/ottl-parse-json-array.yaml diff --git a/.chloggen/ottl-parse-json-array.yaml b/.chloggen/ottl-parse-json-array.yaml new file mode 100644 index 000000000000..9bc47cd0e5e9 --- /dev/null +++ b/.chloggen/ottl-parse-json-array.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: pkg/ottl + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Handle JSON array provided to ParseJSON function + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33535] + +# (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/pkg/ottl/e2e/e2e_test.go b/pkg/ottl/e2e/e2e_test.go index 5b9d52b8ab39..62e2ff007cab 100644 --- a/pkg/ottl/e2e/e2e_test.go +++ b/pkg/ottl/e2e/e2e_test.go @@ -547,6 +547,14 @@ func Test_e2e_converters(t *testing.T) { m.PutDouble("id", 1) }, }, + { + statement: `set(attributes["test"], ParseJSON("[\"value1\",\"value2\"]"))`, + want: func(tCtx ottllog.TransformContext) { + m := tCtx.GetLogRecord().Attributes().PutEmptySlice("test") + m.AppendEmpty().SetStr("value1") + m.AppendEmpty().SetStr("value2") + }, + }, { statement: `set(attributes["test"], ParseKeyValue("k1=v1 k2=v2"))`, want: func(tCtx ottllog.TransformContext) { diff --git a/pkg/ottl/ottlfuncs/README.md b/pkg/ottl/ottlfuncs/README.md index 519de40bc45a..bb7ee3466aaf 100644 --- a/pkg/ottl/ottlfuncs/README.md +++ b/pkg/ottl/ottlfuncs/README.md @@ -1010,7 +1010,7 @@ Examples: `ParseJSON(target)` -The `ParseJSON` Converter returns a `pcommon.Map` struct that is a result of parsing the target string as JSON +The `ParseJSON` Converter returns a `pcommon.Map` or `pcommon.Slice` struct that is a result of parsing the target string as JSON `target` is a Getter that returns a string. This string should be in json format. If `target` is not a string, nil, or cannot be parsed as JSON, `ParseJSON` will return an error. @@ -1032,6 +1032,9 @@ Examples: - `ParseJSON("{\"attr\":true}")` +- `ParseJSON("[\"attr1\",\"attr2\"]")` + + - `ParseJSON(attributes["kubernetes"])` diff --git a/pkg/ottl/ottlfuncs/func_parse_json.go b/pkg/ottl/ottlfuncs/func_parse_json.go index 8cca75f71601..637390177e87 100644 --- a/pkg/ottl/ottlfuncs/func_parse_json.go +++ b/pkg/ottl/ottlfuncs/func_parse_json.go @@ -31,7 +31,7 @@ func createParseJSONFunction[K any](_ ottl.FunctionContext, oArgs ottl.Arguments return parseJSON(args.Target), nil } -// parseJSON returns a `pcommon.Map` struct that is a result of parsing the target string as JSON +// parseJSON returns a `pcommon.Map` or `pcommon.Slice` struct that is a result of parsing the target string as JSON // Each JSON type is converted into a `pdata.Value` using the following map: // // JSON boolean -> bool @@ -46,13 +46,22 @@ func parseJSON[K any](target ottl.StringGetter[K]) ottl.ExprFunc[K] { if err != nil { return nil, err } - var parsedValue map[string]any + var parsedValue any err = jsoniter.UnmarshalFromString(targetVal, &parsedValue) if err != nil { return nil, err } - result := pcommon.NewMap() - err = result.FromRaw(parsedValue) - return result, err + switch v := parsedValue.(type) { + case []any: + result := pcommon.NewSlice() + err = result.FromRaw(v) + return result, err + case map[string]any: + result := pcommon.NewMap() + err = result.FromRaw(v) + return result, err + default: + return nil, fmt.Errorf("could not convert parsed value of type %T to JSON object", v) + } } } diff --git a/pkg/ottl/ottlfuncs/func_parse_json_test.go b/pkg/ottl/ottlfuncs/func_parse_json_test.go index f557a5fad1ee..835f95d0bba5 100644 --- a/pkg/ottl/ottlfuncs/func_parse_json_test.go +++ b/pkg/ottl/ottlfuncs/func_parse_json_test.go @@ -16,9 +16,10 @@ import ( func Test_ParseJSON(t *testing.T) { tests := []struct { - name string - target ottl.StringGetter[any] - want func(pcommon.Map) + name string + target ottl.StringGetter[any] + wantMap func(pcommon.Map) + wantSlice func(pcommon.Slice) }{ { name: "handle string", @@ -27,7 +28,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":"string value"}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutStr("test", "string value") }, }, @@ -38,7 +39,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":true}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutBool("test", true) }, }, @@ -49,7 +50,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":1}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutDouble("test", 1) }, }, @@ -60,7 +61,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":1.1}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutDouble("test", 1.1) }, }, @@ -71,7 +72,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":null}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutEmpty("test") }, }, @@ -82,12 +83,37 @@ func Test_ParseJSON(t *testing.T) { return `{"test":["string","value"]}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { emptySlice := expectedMap.PutEmptySlice("test") emptySlice.AppendEmpty().SetStr("string") emptySlice.AppendEmpty().SetStr("value") }, }, + { + name: "handle top level array", + target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `["string","value"]`, nil + }, + }, + wantSlice: func(expectedSlice pcommon.Slice) { + expectedSlice.AppendEmpty().SetStr("string") + expectedSlice.AppendEmpty().SetStr("value") + }, + }, + { + name: "handle top level array of objects", + target: ottl.StandardStringGetter[any]{ + Getter: func(_ context.Context, _ any) (any, error) { + return `[{"test":"value"},{"test":"value"}]`, nil + }, + }, + wantSlice: func(expectedSlice pcommon.Slice) { + + expectedSlice.AppendEmpty().SetEmptyMap().PutStr("test", "value") + expectedSlice.AppendEmpty().SetEmptyMap().PutStr("test", "value") + }, + }, { name: "handle nested object", target: ottl.StandardStringGetter[any]{ @@ -95,7 +121,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test":{"nested":"true"}}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { newMap := expectedMap.PutEmptyMap("test") newMap.PutStr("nested", "true") }, @@ -107,7 +133,7 @@ func Test_ParseJSON(t *testing.T) { return `{"existing":"pass"}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { expectedMap.PutStr("existing", "pass") }, }, @@ -118,7 +144,7 @@ func Test_ParseJSON(t *testing.T) { return `{"test1":{"nested":"true"},"test2":"string","test3":1,"test4":1.1,"test5":[[1], [2, 3],[]],"test6":null}`, nil }, }, - want: func(expectedMap pcommon.Map) { + wantMap: func(expectedMap pcommon.Map) { newMap := expectedMap.PutEmptyMap("test1") newMap.PutStr("nested", "true") expectedMap.PutStr("test2", "string") @@ -141,19 +167,26 @@ func Test_ParseJSON(t *testing.T) { result, err := exprFunc(context.Background(), nil) assert.NoError(t, err) - resultMap, ok := result.(pcommon.Map) - require.True(t, ok) - - expected := pcommon.NewMap() - tt.want(expected) + if tt.wantMap != nil { + resultMap, ok := result.(pcommon.Map) + require.True(t, ok) + expected := pcommon.NewMap() + tt.wantMap(expected) + assert.Equal(t, expected.Len(), resultMap.Len()) + expected.Range(func(k string, _ pcommon.Value) bool { + ev, _ := expected.Get(k) + av, _ := resultMap.Get(k) + assert.Equal(t, ev, av) + return true + }) + } else if tt.wantSlice != nil { + resultSlice, ok := result.(pcommon.Slice) + require.True(t, ok) + expected := pcommon.NewSlice() + tt.wantSlice(expected) + assert.Equal(t, expected, resultSlice) + } - assert.Equal(t, expected.Len(), resultMap.Len()) - expected.Range(func(k string, _ pcommon.Value) bool { - ev, _ := expected.Get(k) - av, _ := resultMap.Get(k) - assert.Equal(t, ev, av) - return true - }) }) } } From 76c6a979b7a7664cafa94170f10f50dc60a8d8dd Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 25 Jul 2024 15:14:10 -0400 Subject: [PATCH 24/30] Update GCP dependencies to v0.48.1/v1.24.1 (#34232) **Description:** Updates GCP dependencies to latest release, see notes: https://github.com/GoogleCloudPlatform/opentelemetry-operations-go/releases/tag/v0.48.1 Notably, this fixes a typo in the `exporter.googlemanagedpromethues.intToDouble` feature gate **Testing:** downstream unit/integration **Documentation:** Updated GMP exporter readme to reflect change Replaces https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34231 --- .chloggen/gcp-0481.yaml | 27 +++++++ cmd/otelcontribcol/go.mod | 14 ++-- cmd/otelcontribcol/go.sum | 32 ++++---- exporter/googlecloudexporter/go.mod | 38 ++++----- exporter/googlecloudexporter/go.sum | 80 ++++++++++--------- .../googlemanagedprometheusexporter/README.md | 4 +- .../googlemanagedprometheusexporter/go.mod | 34 ++++---- .../googlemanagedprometheusexporter/go.sum | 72 +++++++++-------- 8 files changed, 170 insertions(+), 131 deletions(-) create mode 100644 .chloggen/gcp-0481.yaml diff --git a/.chloggen/gcp-0481.yaml b/.chloggen/gcp-0481.yaml new file mode 100644 index 000000000000..d81d708cc433 --- /dev/null +++ b/.chloggen/gcp-0481.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: breaking + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: googlemanagedprometheusexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fix typo in `exporter.googlemanagedpromethues.intToDouble` feature gate + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34232] + +# (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/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 1cb004a57538..1401d8ae61eb 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -250,10 +250,10 @@ require ( cloud.google.com/go/iam v1.1.10 // indirect cloud.google.com/go/logging v1.10.0 // indirect cloud.google.com/go/longrunning v0.5.9 // indirect - cloud.google.com/go/monitoring v1.20.1 // indirect + cloud.google.com/go/monitoring v1.20.2 // indirect cloud.google.com/go/pubsub v1.40.0 // indirect cloud.google.com/go/spanner v1.64.0 // indirect - cloud.google.com/go/trace v1.10.9 // indirect + cloud.google.com/go/trace v1.10.10 // indirect code.cloudfoundry.org/clock v0.0.0-20180518195852-02e53af36e6c // indirect code.cloudfoundry.org/go-diodes v0.0.0-20211115184647-b584dd5df32c // indirect code.cloudfoundry.org/go-loggregator v7.4.0+incompatible // indirect @@ -363,11 +363,11 @@ require ( github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/extension/googleclientauthextension v0.48.1-0.20240618202726-8ffe2564d48b // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/IBM/sarama v1.43.2 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect @@ -815,7 +815,7 @@ require ( gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/api v0.189.0 // indirect google.golang.org/genproto v0.0.0-20240722135656-d784300faade // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index ac8cb4159b92..9cd274a9ed89 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -383,8 +383,8 @@ cloud.google.com/go/monitoring v1.7.0/go.mod h1:HpYse6kkGo//7p6sT0wsIC6IBDET0RhI cloud.google.com/go/monitoring v1.8.0/go.mod h1:E7PtoMJ1kQXWxPjB6mv2fhC5/15jInuulFdYYtlcvT4= cloud.google.com/go/monitoring v1.12.0/go.mod h1:yx8Jj2fZNEkL/GYZyTLS4ZtZEZN8WtDEiEqG4kLK50w= cloud.google.com/go/monitoring v1.13.0/go.mod h1:k2yMBAB1H9JT/QETjNkgdCGD9bPF712XiLTVr+cBrpw= -cloud.google.com/go/monitoring v1.20.1 h1:XmM6uk4+mI2ZhWdI2n/2GNhJdpeQN+1VdG2UWEDhX48= -cloud.google.com/go/monitoring v1.20.1/go.mod h1:FYSe/brgfuaXiEzOQFhTjsEsJv+WePyK71X7Y8qo6uQ= +cloud.google.com/go/monitoring v1.20.2 h1:B/L+xrw9PYO7ywh37sgnjI/6dzEE+yQTAwfytDcpPto= +cloud.google.com/go/monitoring v1.20.2/go.mod h1:36rpg/7fdQ7NX5pG5x1FA7cXTVXusOp6Zg9r9e1+oek= cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA= cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o= cloud.google.com/go/networkconnectivity v1.6.0/go.mod h1:OJOoEXW+0LAxHh89nXd64uGG+FbQoeH8DtxCHVOMlaM= @@ -571,8 +571,8 @@ cloud.google.com/go/trace v1.3.0/go.mod h1:FFUE83d9Ca57C+K8rDl/Ih8LwOzWIV1krKgxg cloud.google.com/go/trace v1.4.0/go.mod h1:UG0v8UBqzusp+z63o7FK74SdFE+AXpCLdFb1rshXG+Y= cloud.google.com/go/trace v1.8.0/go.mod h1:zH7vcsbAhklH8hWFig58HvxcxyQbaIqMarMg9hn5ECA= cloud.google.com/go/trace v1.9.0/go.mod h1:lOQqpE5IaWY0Ixg7/r2SjixMuc6lfTFeO4QGM4dQWOk= -cloud.google.com/go/trace v1.10.9 h1:Cy6D1Zdz8up4mIPUWModTuIGDr3fh7AZaCnR+uyxpgA= -cloud.google.com/go/trace v1.10.9/go.mod h1:vtWRnvEh+d8h2xljwxVwsdxxpoWZkxcNYnJF3FuJUV8= +cloud.google.com/go/trace v1.10.10 h1:eiIFoRp1qTh2tRemTd8HIE7qZ0Ok5l7dl9pYsNWoXjk= +cloud.google.com/go/trace v1.10.10/go.mod h1:5b1BiSYQO27KgGRevNFfoIQ8czwpVgnkKbTLb4wV+XM= cloud.google.com/go/translate v1.3.0/go.mod h1:gzMUwRjvOqj5i69y/LYLd8RrNQk+hOmIXTi9+nb3Djs= cloud.google.com/go/translate v1.4.0/go.mod h1:06Dn/ppvLD6WvA5Rhdp029IX2Mi3Mn7fpMRLPvXT5Wg= cloud.google.com/go/translate v1.5.0/go.mod h1:29YDSYveqqpA1CQFD7NQuP49xymq17RXNaUDdc0mNu0= @@ -889,18 +889,18 @@ github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0 h1:oVLqHXhnYtUwM89y9T1 github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.0/go.mod h1:dppbR7CwXD4pgtV9t3wD1812RaLDcBjtblcDF5f1vI0= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 h1:N4xzkSD2BkRwEZSPf3C2eUZxjS5trpo4gOwRh8mu+BA= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0/go.mod h1:p2puVVSKjQ84Qb1gzw2XHLs34WQyHTYFZLaVxypAFYs= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 h1:YCiG6G1ogXhcHN3QDSdpZYSlWXQqyY17wNP0rTq2Xl4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0/go.mod h1:q7F6vY0LTiq/69yuKlcDezJMcsLd36n3uJrplq/PGtQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0 h1:oWZ/JwjyeqiTgmrU3Y7dvqlQJB/AiOdG76cjFni0tAI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0/go.mod h1:VkkA3E9i8gTBNBIsAjypbvpwei4dSokmLdHsXLzwHOk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 h1:TBo1ql03qmVkZzEndpfkS4i9dOgCVvO0rQP7HEth110= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0/go.mod h1:pix4dhb6R3oDGZgQhkEGGC+5ZTz6kcxOhS4lhsSJhrE= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 h1:55BCCek53ynaXLoMS8bdivu34TYZ4dnKzi4sOf7qtIU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1/go.mod h1:n8ee0TUmtsXm2GUWL86jkrxc8mPGRLuTJg13M/iW6Q0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1 h1:u/of4NZ/0vK8c9Zjt6QLQtHjzjxKvplbrU8r1kLLYTk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1/go.mod h1:nolt+2xPwKxTH0sQ5SKrK0kKEvVq12N/+3r6vhAmPvw= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 h1:01bHLeqkrxYSkjvyTBEZ8rxBxDhWm1snWGEW73Te4lU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1/go.mod h1:UFO9jC3njhKdD/ymLnaKi7Or5miVWq06LvRWQNFfnTU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/extension/googleclientauthextension v0.48.1-0.20240618202726-8ffe2564d48b h1:D74jTqhI0GJScnILiBkbHYjo72MzS9GiKkwvmJoJaGg= github.com/GoogleCloudPlatform/opentelemetry-operations-go/extension/googleclientauthextension v0.48.1-0.20240618202726-8ffe2564d48b/go.mod h1:c6YKtdPYihp0nV3JBB5k0MC3ejONYSsrzYemtxgOQpA= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0 h1:3vze4eFE3z2tDy2iSeI7yCQ17L8iLxN4OkXgvTr979s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0/go.mod h1:PdB0wkmILI+phhoBhWdrrB4LfORT9tHc03OOn+q3dWU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 h1:ng6QH9Z4bAXCf0Z1cjR5hKESyc1BUiOrfIOhN+nHfRU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0/go.mod h1:ZC7rjqRzdhRKDK223jQ7Tsz89ZtrSSLH/VFzf7k5Sb0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/IBM/sarama v1.43.2 h1:HABeEqRUh32z8yzY2hGB/j8mHSzC/HA9zlEjqFNCzSw= @@ -3203,8 +3203,8 @@ google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= google.golang.org/genproto v0.0.0-20240722135656-d784300faade h1:lKFsS7wpngDgSCeFn7MoLy+wBDQZ1UQIJD4UNM1Qvkg= google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 h1:a/Z0jgw03aJ2rQnp5PlPpznJqJft0HyvyrcUcxgzPwY= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade h1:oCRSWfwGXQsqlVdErcyTt4A93Y8fo0/9D4b1gnI++qo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index b6417c5e9658..675e192ab760 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google go 1.21.0 require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe @@ -16,14 +16,16 @@ require ( ) require ( - cloud.google.com/go v0.112.1 // indirect - cloud.google.com/go/compute/metadata v0.3.0 // indirect - cloud.google.com/go/logging v1.9.0 // indirect - cloud.google.com/go/longrunning v0.5.5 // indirect - cloud.google.com/go/monitoring v1.18.0 // indirect - cloud.google.com/go/trace v1.10.5 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.7.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/logging v1.10.0 // indirect + cloud.google.com/go/longrunning v0.5.9 // indirect + cloud.google.com/go/monitoring v1.20.2 // indirect + cloud.google.com/go/trace v1.10.10 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -39,7 +41,7 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.5 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect @@ -69,8 +71,8 @@ require ( go.opentelemetry.io/collector/internal/globalgates v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/collector/receiver v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/collector/semconv v0.105.1-0.20240717163034-43ed6184f9fe // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect go.opentelemetry.io/otel/sdk v1.28.0 // indirect @@ -78,17 +80,17 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/net v0.26.0 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/api v0.169.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/api v0.188.0 // indirect + google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 612bb3de2549..14beb3191f48 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -1,25 +1,29 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= -cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZw= -cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE= -cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= -cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= -cloud.google.com/go/monitoring v1.18.0 h1:NfkDLQDG2UR3WYZVQE8kwSbUIEyIqJUPl+aOQdFH1T4= -cloud.google.com/go/monitoring v1.18.0/go.mod h1:c92vVBCeq/OB4Ioyo+NbN2U7tlg5ZH41PZcdvfc+Lcg= -cloud.google.com/go/trace v1.10.5 h1:0pr4lIKJ5XZFYD9GtxXEWr0KkVeigc3wlGpZco0X1oA= -cloud.google.com/go/trace v1.10.5/go.mod h1:9hjCV1nGBCtXbAE4YK7OqJ8pmPYSxPA0I67JwRd5s3M= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= +cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/logging v1.10.0 h1:f+ZXMqyrSJ5vZ5pE/zr0xC8y/M9BLNzQeLBwfeZ+wY4= +cloud.google.com/go/logging v1.10.0/go.mod h1:EHOwcxlltJrYGqMGfghSet736KR3hX1MAj614mrMk9I= +cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k= +cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= +cloud.google.com/go/monitoring v1.20.2 h1:B/L+xrw9PYO7ywh37sgnjI/6dzEE+yQTAwfytDcpPto= +cloud.google.com/go/monitoring v1.20.2/go.mod h1:36rpg/7fdQ7NX5pG5x1FA7cXTVXusOp6Zg9r9e1+oek= +cloud.google.com/go/trace v1.10.10 h1:eiIFoRp1qTh2tRemTd8HIE7qZ0Ok5l7dl9pYsNWoXjk= +cloud.google.com/go/trace v1.10.10/go.mod h1:5b1BiSYQO27KgGRevNFfoIQ8czwpVgnkKbTLb4wV+XM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 h1:YCiG6G1ogXhcHN3QDSdpZYSlWXQqyY17wNP0rTq2Xl4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0/go.mod h1:q7F6vY0LTiq/69yuKlcDezJMcsLd36n3uJrplq/PGtQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 h1:TBo1ql03qmVkZzEndpfkS4i9dOgCVvO0rQP7HEth110= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0/go.mod h1:pix4dhb6R3oDGZgQhkEGGC+5ZTz6kcxOhS4lhsSJhrE= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0 h1:3vze4eFE3z2tDy2iSeI7yCQ17L8iLxN4OkXgvTr979s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0/go.mod h1:PdB0wkmILI+phhoBhWdrrB4LfORT9tHc03OOn+q3dWU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 h1:ng6QH9Z4bAXCf0Z1cjR5hKESyc1BUiOrfIOhN+nHfRU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0/go.mod h1:ZC7rjqRzdhRKDK223jQ7Tsz89ZtrSSLH/VFzf7k5Sb0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 h1:55BCCek53ynaXLoMS8bdivu34TYZ4dnKzi4sOf7qtIU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1/go.mod h1:n8ee0TUmtsXm2GUWL86jkrxc8mPGRLuTJg13M/iW6Q0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 h1:01bHLeqkrxYSkjvyTBEZ8rxBxDhWm1snWGEW73Te4lU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1/go.mod h1:UFO9jC3njhKdD/ymLnaKi7Or5miVWq06LvRWQNFfnTU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -81,8 +85,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= -github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA= +github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -176,10 +180,10 @@ go.opentelemetry.io/collector/receiver v0.105.1-0.20240717163034-43ed6184f9fe h1 go.opentelemetry.io/collector/receiver v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:nGKDXLUGVHxMBJ5QLfsJ/bIhGvoMGqsN0pZtD5SC8sE= go.opentelemetry.io/collector/semconv v0.105.1-0.20240717163034-43ed6184f9fe h1:mFhyrzgPz/8uUhCK0j5OuuwkAL2RlM9O7ciVpeXAHdE= go.opentelemetry.io/collector/semconv v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:yMVUCNoQPZVq/IPfrHrnntZTWsLf5YGZ7qwKulIl5hw= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 h1:cEPbyTSEHlQR89XVlyo78gqluF8Y3oMeBkXGWzQsfXY= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0/go.mod h1:DKdbWcT4GH1D0Y3Sqt/PFXt2naRKDWtU+eE6oLdFNA8= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/prometheus v0.50.0 h1:2Ewsda6hejmbhGFyUvWZjUThC98Cf8Zy6g0zkIimOng= @@ -203,8 +207,8 @@ go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= 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.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -220,8 +224,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= -golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= @@ -256,19 +260,19 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T 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/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY= -google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= +google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= +google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 h1:a/Z0jgw03aJ2rQnp5PlPpznJqJft0HyvyrcUcxgzPwY= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 h1:SbSDUWW1PAO24TNpLdeheoYPd7kllICcLU52x6eD4kQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= diff --git a/exporter/googlemanagedprometheusexporter/README.md b/exporter/googlemanagedprometheusexporter/README.md index 2bf8eaceff1c..57c00ec2aa4e 100644 --- a/exporter/googlemanagedprometheusexporter/README.md +++ b/exporter/googlemanagedprometheusexporter/README.md @@ -185,11 +185,11 @@ processors: ## Feature-gates -- `exporter.googlemanagedpromethues.intToDouble`: `Default=false` Change all metric datapoint type to double +- `exporter.googlemanagedprometheus.intToDouble`: `Default=false` Change all metric datapoint type to double to prevent `Value type for metric conflicts with the existing value type` errors: ```shell -"--feature-gates=exporter.googlemanagedpromethues.intToDouble" +"--feature-gates=exporter.googlemanagedprometheus.intToDouble" ``` ## Troubleshooting diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index c4cd68eb307d..9019fdbdceae 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/google go 1.21.0 require ( - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1 github.com/stretchr/testify v1.9.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/confmap v0.105.1-0.20240717163034-43ed6184f9fe @@ -17,14 +17,16 @@ require ( ) require ( - cloud.google.com/go v0.112.1 // indirect - cloud.google.com/go/compute/metadata v0.3.0 // indirect - cloud.google.com/go/logging v1.9.0 // indirect - cloud.google.com/go/longrunning v0.5.5 // indirect - cloud.google.com/go/monitoring v1.18.0 // indirect - cloud.google.com/go/trace v1.10.5 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 // indirect - github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 // indirect + cloud.google.com/go v0.115.0 // indirect + cloud.google.com/go/auth v0.7.0 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.3 // indirect + cloud.google.com/go/compute/metadata v0.5.0 // indirect + cloud.google.com/go/logging v1.10.0 // indirect + cloud.google.com/go/longrunning v0.5.9 // indirect + cloud.google.com/go/monitoring v1.20.2 // indirect + cloud.google.com/go/trace v1.10.10 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 // indirect + github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -41,7 +43,7 @@ require ( github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect - github.com/googleapis/gax-go/v2 v2.12.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.5 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -96,7 +98,7 @@ require ( go.opentelemetry.io/collector/semconv v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/collector/service v0.105.1-0.20240717163034-43ed6184f9fe // indirect go.opentelemetry.io/contrib/config v0.8.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect @@ -127,10 +129,10 @@ require ( golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/api v0.169.0 // indirect - google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/api v0.188.0 // indirect + google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 1537b150261f..38ce1d4c4eb3 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -1,27 +1,31 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.112.1 h1:uJSeirPke5UNZHIb4SxfZklVSiWWVqW4oXlETwZziwM= -cloud.google.com/go v0.112.1/go.mod h1:+Vbu+Y1UU+I1rjmzeMOb/8RfkKJK2Gyxi1X6jJCZLo4= -cloud.google.com/go/compute/metadata v0.3.0 h1:Tz+eQXMEqDIKRsmY3cHTL6FVaynIjX2QxYC4trgAKZc= -cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= -cloud.google.com/go/logging v1.9.0 h1:iEIOXFO9EmSiTjDmfpbRjOxECO7R8C7b8IXUGOj7xZw= -cloud.google.com/go/logging v1.9.0/go.mod h1:1Io0vnZv4onoUnsVUQY3HZ3Igb1nBchky0A0y7BBBhE= -cloud.google.com/go/longrunning v0.5.5 h1:GOE6pZFdSrTb4KAiKnXsJBtlE6mEyaW44oKyMILWnOg= -cloud.google.com/go/longrunning v0.5.5/go.mod h1:WV2LAxD8/rg5Z1cNW6FJ/ZpX4E4VnDnoTk0yawPBB7s= -cloud.google.com/go/monitoring v1.18.0 h1:NfkDLQDG2UR3WYZVQE8kwSbUIEyIqJUPl+aOQdFH1T4= -cloud.google.com/go/monitoring v1.18.0/go.mod h1:c92vVBCeq/OB4Ioyo+NbN2U7tlg5ZH41PZcdvfc+Lcg= -cloud.google.com/go/trace v1.10.5 h1:0pr4lIKJ5XZFYD9GtxXEWr0KkVeigc3wlGpZco0X1oA= -cloud.google.com/go/trace v1.10.5/go.mod h1:9hjCV1nGBCtXbAE4YK7OqJ8pmPYSxPA0I67JwRd5s3M= +cloud.google.com/go v0.115.0 h1:CnFSK6Xo3lDYRoBKEcAtia6VSC837/ZkJuRduSFnr14= +cloud.google.com/go v0.115.0/go.mod h1:8jIM5vVgoAEoiVxQ/O4BFTfHqulPZgs/ufEzMcFMdWU= +cloud.google.com/go/auth v0.7.0 h1:kf/x9B3WTbBUHkC+1VS8wwwli9TzhSt0vSTVBmMR8Ts= +cloud.google.com/go/auth v0.7.0/go.mod h1:D+WqdrpcjmiCgWrXmLLxOVq1GACoE36chW6KXoEvuIw= +cloud.google.com/go/auth/oauth2adapt v0.2.3 h1:MlxF+Pd3OmSudg/b1yZ5lJwoXCEaeedAguodky1PcKI= +cloud.google.com/go/auth/oauth2adapt v0.2.3/go.mod h1:tMQXOfZzFuNuUxOypHlQEXgdfX5cuhwU+ffUuXRJE8I= +cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY= +cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY= +cloud.google.com/go/logging v1.10.0 h1:f+ZXMqyrSJ5vZ5pE/zr0xC8y/M9BLNzQeLBwfeZ+wY4= +cloud.google.com/go/logging v1.10.0/go.mod h1:EHOwcxlltJrYGqMGfghSet736KR3hX1MAj614mrMk9I= +cloud.google.com/go/longrunning v0.5.9 h1:haH9pAuXdPAMqHvzX0zlWQigXT7B0+CL4/2nXXdBo5k= +cloud.google.com/go/longrunning v0.5.9/go.mod h1:HD+0l9/OOW0za6UWdKJtXoFAX/BGg/3Wj8p10NeWF7c= +cloud.google.com/go/monitoring v1.20.2 h1:B/L+xrw9PYO7ywh37sgnjI/6dzEE+yQTAwfytDcpPto= +cloud.google.com/go/monitoring v1.20.2/go.mod h1:36rpg/7fdQ7NX5pG5x1FA7cXTVXusOp6Zg9r9e1+oek= +cloud.google.com/go/trace v1.10.10 h1:eiIFoRp1qTh2tRemTd8HIE7qZ0Ok5l7dl9pYsNWoXjk= +cloud.google.com/go/trace v1.10.10/go.mod h1:5b1BiSYQO27KgGRevNFfoIQ8czwpVgnkKbTLb4wV+XM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0 h1:YCiG6G1ogXhcHN3QDSdpZYSlWXQqyY17wNP0rTq2Xl4= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.0/go.mod h1:q7F6vY0LTiq/69yuKlcDezJMcsLd36n3uJrplq/PGtQ= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0 h1:oWZ/JwjyeqiTgmrU3Y7dvqlQJB/AiOdG76cjFni0tAI= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.0/go.mod h1:VkkA3E9i8gTBNBIsAjypbvpwei4dSokmLdHsXLzwHOk= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0 h1:TBo1ql03qmVkZzEndpfkS4i9dOgCVvO0rQP7HEth110= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.0/go.mod h1:pix4dhb6R3oDGZgQhkEGGC+5ZTz6kcxOhS4lhsSJhrE= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0 h1:3vze4eFE3z2tDy2iSeI7yCQ17L8iLxN4OkXgvTr979s= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.0/go.mod h1:PdB0wkmILI+phhoBhWdrrB4LfORT9tHc03OOn+q3dWU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0 h1:ng6QH9Z4bAXCf0Z1cjR5hKESyc1BUiOrfIOhN+nHfRU= -github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.0/go.mod h1:ZC7rjqRzdhRKDK223jQ7Tsz89ZtrSSLH/VFzf7k5Sb0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1 h1:55BCCek53ynaXLoMS8bdivu34TYZ4dnKzi4sOf7qtIU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.48.1/go.mod h1:n8ee0TUmtsXm2GUWL86jkrxc8mPGRLuTJg13M/iW6Q0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1 h1:u/of4NZ/0vK8c9Zjt6QLQtHjzjxKvplbrU8r1kLLYTk= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.48.1/go.mod h1:nolt+2xPwKxTH0sQ5SKrK0kKEvVq12N/+3r6vhAmPvw= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1 h1:01bHLeqkrxYSkjvyTBEZ8rxBxDhWm1snWGEW73Te4lU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.24.1/go.mod h1:UFO9jC3njhKdD/ymLnaKi7Or5miVWq06LvRWQNFfnTU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1 h1:oTX4vsorBZo/Zdum6OKPA4o7544hm6smoRv1QjpTwGo= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.48.1/go.mod h1:0wEl7vrAD8mehJyohS9HZy+WyEOaQO2mJx86Cvh93kM= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 h1:8nn+rsCvTq9axyEh382S0PFLBeaFwNsT43IrPWzctRU= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1/go.mod h1:viRWSEhtMZqz1rhwmOVKkWl6SwmVowfL9O2YR5gI2PE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= @@ -89,8 +93,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= -github.com/googleapis/gax-go/v2 v2.12.2 h1:mhN09QQW1jEWeMF74zGR81R30z4VJzjZsfkUhuHF+DA= -github.com/googleapis/gax-go/v2 v2.12.2/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +github.com/googleapis/gax-go/v2 v2.12.5 h1:8gw9KZK8TiVKB6q3zHY3SBzLnrGp6HQjyfYBYGmXdxA= +github.com/googleapis/gax-go/v2 v2.12.5/go.mod h1:BUDKcWo+RaKq5SC9vVYL0wLADa3VcfswbOMMRmB9H3E= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= @@ -251,8 +255,8 @@ go.opentelemetry.io/collector/service v0.105.1-0.20240717163034-43ed6184f9fe h1: go.opentelemetry.io/collector/service v0.105.1-0.20240717163034-43ed6184f9fe/go.mod h1:H0fD5SZjV2AZTgHEjRhObnP8YrhG2etAh9rsWLtmimQ= go.opentelemetry.io/contrib/config v0.8.0 h1:OD7aDMhL+2EpzdSHfkDmcdD/uUA+PgKM5faFyF9XFT0= go.opentelemetry.io/contrib/config v0.8.0/go.mod h1:dGeVZWE//3wrxYHHP0iCBYJU1QmOmPcbV+FNB7pjDYI= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0 h1:vS1Ao/R55RNV4O7TA2Qopok8yN+X0LIP6RVWLFkprck= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0/go.mod h1:BMsdeOxN04K0L5FNUBfjFdvwWGNe/rkmSwH4Aelu/X0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y= @@ -367,19 +371,19 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= -google.golang.org/api v0.169.0 h1:QwWPy71FgMWqJN/l6jVlFHUa29a7dcUy02I8o799nPY= -google.golang.org/api v0.169.0/go.mod h1:gpNOiMA2tZ4mf5R9Iwf4rK/Dcz0fbdIgWYWVoxmsyLg= +google.golang.org/api v0.188.0 h1:51y8fJ/b1AaaBRJr4yWm96fPcuxSo0JcegXE3DaHQHw= +google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= -google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b h1:dSTjko30weBaMj3eERKc0ZVXW4GudCswM3m+P++ukU0= +google.golang.org/genproto v0.0.0-20240708141625-4ad9e859172b/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5 h1:a/Z0jgw03aJ2rQnp5PlPpznJqJft0HyvyrcUcxgzPwY= +google.golang.org/genproto/googleapis/api v0.0.0-20240709173604-40e1e62336c5/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 h1:SbSDUWW1PAO24TNpLdeheoYPd7kllICcLU52x6eD4kQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= From 2b29645033e15eb6877e2f9ce35f97fc426dca19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 12:16:28 -0700 Subject: [PATCH 25/30] Update module github.com/Azure/azure-kusto-go to v0.16.0 (#34223) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [github.com/Azure/azure-kusto-go](https://togithub.com/Azure/azure-kusto-go) | `v0.15.3` -> `v0.16.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fAzure%2fazure-kusto-go/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fAzure%2fazure-kusto-go/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fAzure%2fazure-kusto-go/v0.15.3/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fAzure%2fazure-kusto-go/v0.15.3/v0.16.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes
Azure/azure-kusto-go (github.com/Azure/azure-kusto-go) ### [`v0.16.0`](https://togithub.com/Azure/azure-kusto-go/compare/v0.15.3...v0.16.0) [Compare Source](https://togithub.com/Azure/azure-kusto-go/compare/v0.15.3...v0.16.0)
--- ### Configuration 📅 **Schedule**: Branch creation - "on tuesday" (UTC), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View the [repository job log](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: opentelemetrybot <107717825+opentelemetrybot@users.noreply.github.com> Co-authored-by: Yang Song --- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- exporter/azuredataexplorerexporter/go.mod | 2 +- exporter/azuredataexplorerexporter/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 1401d8ae61eb..00664dc8a732 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -264,7 +264,7 @@ require ( github.com/AthenZ/athenz v1.10.39 // indirect github.com/Azure/azure-amqp-common-go/v4 v4.2.0 // indirect github.com/Azure/azure-event-hubs-go/v3 v3.6.2 // indirect - github.com/Azure/azure-kusto-go v0.15.3 // indirect + github.com/Azure/azure-kusto-go v0.16.0 // indirect github.com/Azure/azure-pipeline-go v0.2.3 // indirect github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 9cd274a9ed89..10b46bf08406 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -645,8 +645,8 @@ github.com/Azure/azure-amqp-common-go/v4 v4.2.0 h1:q/jLx1KJ8xeI8XGfkOWMN9XrXzAfV github.com/Azure/azure-amqp-common-go/v4 v4.2.0/go.mod h1:GD3m/WPPma+621UaU6KNjKEo5Hl09z86viKwQjTpV0Q= github.com/Azure/azure-event-hubs-go/v3 v3.6.2 h1:7rNj1/iqS/i3mUKokA2n2eMYO72TB7lO7OmpbKoakKY= github.com/Azure/azure-event-hubs-go/v3 v3.6.2/go.mod h1:n+ocYr9j2JCLYqUqz9eI+lx/TEAtL/g6rZzyTFSuIpc= -github.com/Azure/azure-kusto-go v0.15.3 h1:Ii0p0oLFr6W8o6xHgpjRBjWdjANXaV15nKFs0LVj1dE= -github.com/Azure/azure-kusto-go v0.15.3/go.mod h1:9F2zvXH8B6eWzgI1S4k1ZXAIufnBZ1bv1cW1kB1n3D0= +github.com/Azure/azure-kusto-go v0.16.0 h1:s9Bv1ROkRbP6QZR+D/3TYYTWf14Ggwi+mmCufHp0ASU= +github.com/Azure/azure-kusto-go v0.16.0/go.mod h1:9F2zvXH8B6eWzgI1S4k1ZXAIufnBZ1bv1cW1kB1n3D0= github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index d156f13245c1..3e71e9ba9bb1 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azured go 1.21.0 require ( - github.com/Azure/azure-kusto-go v0.15.3 + github.com/Azure/azure-kusto-go v0.16.0 github.com/google/uuid v1.6.0 github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index 8cc9c5410c7e..b5b5c2139bd7 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -1,5 +1,5 @@ -github.com/Azure/azure-kusto-go v0.15.3 h1:Ii0p0oLFr6W8o6xHgpjRBjWdjANXaV15nKFs0LVj1dE= -github.com/Azure/azure-kusto-go v0.15.3/go.mod h1:9F2zvXH8B6eWzgI1S4k1ZXAIufnBZ1bv1cW1kB1n3D0= +github.com/Azure/azure-kusto-go v0.16.0 h1:s9Bv1ROkRbP6QZR+D/3TYYTWf14Ggwi+mmCufHp0ASU= +github.com/Azure/azure-kusto-go v0.16.0/go.mod h1:9F2zvXH8B6eWzgI1S4k1ZXAIufnBZ1bv1cW1kB1n3D0= github.com/Azure/azure-pipeline-go v0.1.8/go.mod h1:XA1kFWRVhSK+KNFiOhfv83Fv8L9achrP7OxIzeTn1Yg= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= github.com/Azure/azure-pipeline-go v0.2.3/go.mod h1:x841ezTBIMG6O3lAcl8ATHnsOPVl2bqk7S3ta6S6u4k= From 358ab680e0dafe6d923a529849c23643b9d84f3f Mon Sep 17 00:00:00 2001 From: Jeremy Hicks Date: Thu, 25 Jul 2024 15:17:14 -0400 Subject: [PATCH 26/30] 32669 sumconnector config (#33994) **Description:** Fleshes out the config more fully and provides tests for the config and possible combinations of settings **Link to tracking Issue:** #32669 **Testing:** Added test cases and testing for config **Documentation:** No new documentation yet. --- connector/sumconnector/config.go | 96 ++++ connector/sumconnector/config_test.go | 581 ++++++++++++++++++++ connector/sumconnector/factory.go | 30 +- connector/sumconnector/go.mod | 2 +- connector/sumconnector/testdata/config.yaml | 182 ++++++ 5 files changed, 878 insertions(+), 13 deletions(-) create mode 100644 connector/sumconnector/config_test.go create mode 100644 connector/sumconnector/testdata/config.yaml diff --git a/connector/sumconnector/config.go b/connector/sumconnector/config.go index 1aba734793d5..5ca87a03a7bd 100644 --- a/connector/sumconnector/config.go +++ b/connector/sumconnector/config.go @@ -3,6 +3,17 @@ package sumconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/sumconnector" +import ( + "errors" + "fmt" + + "go.opentelemetry.io/collector/component" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterottl" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl" +) + // Config for the connector type Config struct { Spans map[string]MetricInfo `mapstructure:"spans"` @@ -24,3 +35,88 @@ type AttributeConfig struct { Key string `mapstructure:"key"` DefaultValue any `mapstructure:"default_value"` } + +func (c *Config) Validate() (combinedErrors error) { + for name, info := range c.Spans { + if name == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spans: metric name missing")) + } + if info.SourceAttribute == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spans: metric source_attribute missing")) + } + if _, err := filterottl.NewBoolExprForSpan(info.Conditions, filterottl.StandardSpanFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spans condition: metric %q: %w", name, err)) + } + if err := info.validateAttributes(); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spans attributes: metric %q: %w", name, err)) + } + } + for name, info := range c.SpanEvents { + if name == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spanevents: metric name missing")) + } + if info.SourceAttribute == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spanevents: metric source_attribute missing")) + } + if _, err := filterottl.NewBoolExprForSpanEvent(info.Conditions, filterottl.StandardSpanEventFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spanevents condition: metric %q: %w", name, err)) + } + if err := info.validateAttributes(); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("spanevents attributes: metric %q: %w", name, err)) + } + } + for name, info := range c.Metrics { + if name == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("metrics: metric name missing")) + } + if info.SourceAttribute == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("metrics: metric source_attribute missing")) + } + if _, err := filterottl.NewBoolExprForMetric(info.Conditions, filterottl.StandardMetricFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("metrics condition: metric %q: %w", name, err)) + } + if len(info.Attributes) > 0 { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("metrics attributes not supported: metric %q", name)) + } + } + for name, info := range c.DataPoints { + if name == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("datapoints: metric name missing")) + } + if info.SourceAttribute == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("datapoints: metric source_attribute missing")) + } + if _, err := filterottl.NewBoolExprForDataPoint(info.Conditions, filterottl.StandardDataPointFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("datapoints condition: metric %q: %w", name, err)) + } + if err := info.validateAttributes(); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("datapoints attributes: metric %q: %w", name, err)) + } + } + for name, info := range c.Logs { + if name == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("logs: metric name missing")) + } + if info.SourceAttribute == "" { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("logs: metric source_attribute missing")) + } + if _, err := filterottl.NewBoolExprForLog(info.Conditions, filterottl.StandardLogFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()}); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("logs condition: metric %q: %w", name, err)) + } + if err := info.validateAttributes(); err != nil { + combinedErrors = errors.Join(combinedErrors, fmt.Errorf("logs attributes: metric %q: %w", name, err)) + } + } + return combinedErrors +} + +func (i *MetricInfo) validateAttributes() error { + for _, attr := range i.Attributes { + if attr.Key == "" { + return fmt.Errorf("attribute key missing") + } + } + return nil +} + +var _ component.ConfigValidator = (*Config)(nil) diff --git a/connector/sumconnector/config_test.go b/connector/sumconnector/config_test.go new file mode 100644 index 000000000000..17cc98ed5926 --- /dev/null +++ b/connector/sumconnector/config_test.go @@ -0,0 +1,581 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sumconnector + +import ( + "fmt" + "path/filepath" + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap/confmaptest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/sumconnector/internal/metadata" +) + +func TestLoadConfig(t *testing.T) { + testCases := []struct { + name string + expect *Config + }{ + { + name: "custom_description", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + Description: "My span record sum.", + SourceAttribute: "my.attribute", + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + Description: "My spanevent sum.", + SourceAttribute: "my.attribute", + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + Description: "My metric sum.", + SourceAttribute: "my.attribute", + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + Description: "My datapoint sum.", + SourceAttribute: "my.attribute", + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + Description: "My log sum.", + SourceAttribute: "my.attribute", + }, + }, + }, + }, + { + name: "custom_metric", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + SourceAttribute: "my.attribute", + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + SourceAttribute: "my.attribute", + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + SourceAttribute: "my.attribute", + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + SourceAttribute: "my.attribute", + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + SourceAttribute: "my.attribute", + }, + }, + }, + }, + { + name: "condition", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-s")`}, + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-e")`}, + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-m")`}, + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-d")`}, + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-l")`}, + }, + }, + }, + }, + { + name: "multiple_condition", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{ + `IsMatch(resource.attributes["host.name"], "pod-s")`, + `IsMatch(resource.attributes["foo"], "bar-s")`, + }, + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{ + `IsMatch(resource.attributes["host.name"], "pod-e")`, + `IsMatch(resource.attributes["foo"], "bar-e")`, + }, + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{ + `IsMatch(resource.attributes["host.name"], "pod-m")`, + `IsMatch(resource.attributes["foo"], "bar-m")`, + }, + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{ + `IsMatch(resource.attributes["host.name"], "pod-d")`, + `IsMatch(resource.attributes["foo"], "bar-d")`, + }, + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + SourceAttribute: "my.attribute", + Conditions: []string{ + `IsMatch(resource.attributes["host.name"], "pod-l")`, + `IsMatch(resource.attributes["foo"], "bar-l")`, + }, + }, + }, + }, + }, + { + name: "attribute", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + SourceAttribute: "my.attribute", + Attributes: []AttributeConfig{ + {Key: "env"}, + }, + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + SourceAttribute: "my.attribute", + Attributes: []AttributeConfig{ + {Key: "env"}, + }, + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + SourceAttribute: "my.attribute", + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + SourceAttribute: "my.attribute", + Attributes: []AttributeConfig{ + {Key: "env"}, + }, + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + SourceAttribute: "my.attribute", + Attributes: []AttributeConfig{ + {Key: "env"}, + }, + }, + }, + }, + }, + { + name: "multiple_metrics", + expect: &Config{ + Spans: map[string]MetricInfo{ + "my.span.sum": { + Description: "My span sum.", + SourceAttribute: "my.attribute", + }, + "limited.span.sum": { + Description: "Limited span sum.", + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-s")`}, + Attributes: []AttributeConfig{ + { + Key: "env", + }, + { + Key: "component", + DefaultValue: "other", + }, + }, + }, + }, + SpanEvents: map[string]MetricInfo{ + "my.spanevent.sum": { + Description: "My span event sum.", + SourceAttribute: "my.attribute", + }, + "limited.spanevent.sum": { + Description: "Limited span event sum.", + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-e")`}, + Attributes: []AttributeConfig{ + { + Key: "env", + }, + { + Key: "component", + DefaultValue: "other", + }, + }, + }, + }, + Metrics: map[string]MetricInfo{ + "my.metric.sum": { + Description: "My metric sum.", + SourceAttribute: "my.attribute", + }, + "limited.metric.sum": { + Description: "Limited metric sum.", + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-m")`}, + }, + }, + DataPoints: map[string]MetricInfo{ + "my.datapoint.sum": { + Description: "My data point sum.", + SourceAttribute: "my.attribute", + }, + "limited.datapoint.sum": { + Description: "Limited data point sum.", + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-d")`}, + Attributes: []AttributeConfig{ + { + Key: "env", + }, + { + Key: "component", + DefaultValue: "other", + }, + }, + }, + }, + Logs: map[string]MetricInfo{ + "my.logrecord.sum": { + Description: "My log record sum.", + SourceAttribute: "my.attribute", + }, + "limited.logrecord.sum": { + Description: "Limited log record sum.", + SourceAttribute: "my.attribute", + Conditions: []string{`IsMatch(resource.attributes["host.name"], "pod-l")`}, + Attributes: []AttributeConfig{ + { + Key: "env", + }, + { + Key: "component", + DefaultValue: "other", + }, + }, + }, + }, + }, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml")) + require.NoError(t, err) + + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + + sub, err := cm.Sub(component.NewIDWithName(metadata.Type, tc.name).String()) + require.NoError(t, err) + require.NoError(t, sub.Unmarshal(cfg)) + + assert.Equal(t, tc.expect, cfg) + }) + } +} + +func TestConfigErrors(t *testing.T) { + testCases := []struct { + name string + input *Config + expect string + }{ + { + name: "missing_source_attribute_span", + input: &Config{ + Spans: map[string]MetricInfo{ + "span.missing.source.attribute": {}, + }, + }, + expect: "spans: metric source_attribute missing", + }, + { + name: "missing_source_attribute_spanevent", + input: &Config{ + SpanEvents: map[string]MetricInfo{ + "spanevent.missing.source.attribute": {}, + }, + }, + expect: "spanevents: metric source_attribute missing", + }, + { + name: "missing_source_attribute_metric", + input: &Config{ + Metrics: map[string]MetricInfo{ + "metric.missing.source.attribute": {}, + }, + }, + expect: "metrics: metric source_attribute missing", + }, + { + name: "missing_source_attribute_datapoint", + input: &Config{ + DataPoints: map[string]MetricInfo{ + "datapoint.missing.source.attribute": {}, + }, + }, + expect: "datapoints: metric source_attribute missing", + }, + { + name: "missing_source_attribute_log", + input: &Config{ + Logs: map[string]MetricInfo{ + "log.missing.source.attribute": {}, + }, + }, + expect: "logs: metric source_attribute missing", + }, + { + name: "missing_metric_name_span", + input: &Config{ + Spans: map[string]MetricInfo{ + "": { + SourceAttribute: "my.attribute", + }, + }, + }, + expect: "spans: metric name missing", + }, + { + name: "missing_metric_name_spanevent", + input: &Config{ + SpanEvents: map[string]MetricInfo{ + "": { + SourceAttribute: "my.attribute", + }, + }, + }, + expect: "spanevents: metric name missing", + }, + { + name: "missing_metric_name_metric", + input: &Config{ + Metrics: map[string]MetricInfo{ + "": { + SourceAttribute: "my.attribute", + }, + }, + }, + expect: "metrics: metric name missing", + }, + { + name: "missing_metric_name_datapoint", + input: &Config{ + DataPoints: map[string]MetricInfo{ + "": { + SourceAttribute: "my.attribute", + }, + }, + }, + expect: "datapoints: metric name missing", + }, + { + name: "missing_metric_name_log", + input: &Config{ + Logs: map[string]MetricInfo{ + "": { + SourceAttribute: "my.attribute", + }, + }, + }, + expect: "logs: metric name missing", + }, + { + name: "invalid_condition_span", + input: &Config{ + Spans: map[string]MetricInfo{ + "metric.name.spans": { + SourceAttribute: "my.attribute", + Conditions: []string{"invalid condition"}, + }, + }, + }, + expect: fmt.Sprintf("spans condition: metric %q: unable to parse OTTL condition", "metric.name.spans"), + }, + { + name: "invalid_condition_spanevent", + input: &Config{ + SpanEvents: map[string]MetricInfo{ + "metric.name.spanevents": { + SourceAttribute: "my.attribute", + Conditions: []string{"invalid condition"}, + }, + }, + }, + expect: fmt.Sprintf("spanevents condition: metric %q: unable to parse OTTL condition", "metric.name.spanevents"), + }, + { + name: "invalid_condition_metric", + input: &Config{ + Metrics: map[string]MetricInfo{ + "metric.name.metrics": { + SourceAttribute: "my.attribute", + Conditions: []string{"invalid condition"}, + }, + }, + }, + expect: fmt.Sprintf("metrics condition: metric %q: unable to parse OTTL condition", "metric.name.metrics"), + }, + { + name: "invalid_condition_datapoint", + input: &Config{ + DataPoints: map[string]MetricInfo{ + "metric.name.datapoints": { + SourceAttribute: "my.attribute", + Conditions: []string{"invalid condition"}, + }, + }, + }, + expect: fmt.Sprintf("datapoints condition: metric %q: unable to parse OTTL condition", "metric.name.datapoints"), + }, + { + name: "invalid_condition_log", + input: &Config{ + Logs: map[string]MetricInfo{ + "metric.name.logs": { + SourceAttribute: "my.attribute", + Conditions: []string{"invalid condition"}, + }, + }, + }, + expect: fmt.Sprintf("logs condition: metric %q: unable to parse OTTL condition", "metric.name.logs"), + }, + { + name: "multi_error_span", + input: &Config{ + Spans: map[string]MetricInfo{ + "": { + SourceAttribute: "", + Conditions: []string{"invalid condition"}, + Attributes: []AttributeConfig{ + {Key: ""}, + }, + }, + }, + }, + expect: `spans: metric name missing` + "\n" + `spans: metric source_attribute missing` + "\n" + `spans condition: metric "": unable to parse OTTL condition "invalid condition": condition has invalid syntax: 1:9: unexpected token "condition" (expected Value)` + "\n" + `spans attributes: metric "": attribute key missing`, + }, + { + name: "multi_error_spanevent", + input: &Config{ + SpanEvents: map[string]MetricInfo{ + "": { + SourceAttribute: "", + Conditions: []string{"invalid condition"}, + Attributes: []AttributeConfig{ + {Key: ""}, + }, + }, + }, + }, + expect: `spanevents: metric name missing` + "\n" + `spanevents: metric source_attribute missing` + "\n" + `spanevents condition: metric "": unable to parse OTTL condition "invalid condition": condition has invalid syntax: 1:9: unexpected token "condition" (expected Value)` + "\n" + `spanevents attributes: metric "": attribute key missing`, + }, + { + name: "multi_error_metric", + input: &Config{ + Metrics: map[string]MetricInfo{ + "": { + SourceAttribute: "", + Conditions: []string{"invalid condition"}, + Attributes: []AttributeConfig{ + {Key: ""}, + }, + }, + }, + }, + expect: `metrics: metric name missing` + "\n" + `metrics: metric source_attribute missing` + "\n" + `metrics condition: metric "": unable to parse OTTL condition "invalid condition": condition has invalid syntax: 1:9: unexpected token "condition" (expected Value)` + "\n" + `metrics attributes not supported: metric ""`, + }, + { + name: "multi_error_datapoint", + input: &Config{ + DataPoints: map[string]MetricInfo{ + "": { + SourceAttribute: "", + Conditions: []string{"invalid condition"}, + Attributes: []AttributeConfig{ + {Key: ""}, + }, + }, + }, + }, + expect: `datapoints: metric name missing` + "\n" + `datapoints: metric source_attribute missing` + "\n" + `datapoints condition: metric "": unable to parse OTTL condition "invalid condition": condition has invalid syntax: 1:9: unexpected token "condition" (expected Value)` + "\n" + `datapoints attributes: metric "": attribute key missing`, + }, + { + name: "multi_error_log", + input: &Config{ + Logs: map[string]MetricInfo{ + "": { + SourceAttribute: "", + Conditions: []string{"invalid condition"}, + Attributes: []AttributeConfig{ + {Key: ""}, + }, + }, + }, + }, + expect: `logs: metric name missing` + "\n" + `logs: metric source_attribute missing` + "\n" + `logs condition: metric "": unable to parse OTTL condition "invalid condition": condition has invalid syntax: 1:9: unexpected token "condition" (expected Value)` + "\n" + `logs attributes: metric "": attribute key missing`, + }, + } + + for _, tc := range testCases { + t.Run(tc.name, func(t *testing.T) { + err := tc.input.Validate() + assert.Error(t, err) + assert.Contains(t, err.Error(), tc.expect) + }) + } +} diff --git a/connector/sumconnector/factory.go b/connector/sumconnector/factory.go index e239bc31b0ee..122484c9a843 100644 --- a/connector/sumconnector/factory.go +++ b/connector/sumconnector/factory.go @@ -51,8 +51,9 @@ func createTracesToMetrics( spanMetricDefs := make(map[string]metricDef[ottlspan.TransformContext], len(c.Spans)) for name, info := range c.Spans { md := metricDef[ottlspan.TransformContext]{ - desc: info.Description, - attrs: info.Attributes, + desc: info.Description, + attrs: info.Attributes, + sourceAttr: info.SourceAttribute, } if len(info.Conditions) > 0 { // Error checked in Config.Validate() @@ -65,8 +66,9 @@ func createTracesToMetrics( spanEventMetricDefs := make(map[string]metricDef[ottlspanevent.TransformContext], len(c.SpanEvents)) for name, info := range c.SpanEvents { md := metricDef[ottlspanevent.TransformContext]{ - desc: info.Description, - attrs: info.Attributes, + desc: info.Description, + attrs: info.Attributes, + sourceAttr: info.SourceAttribute, } if len(info.Conditions) > 0 { // Error checked in Config.Validate() @@ -95,7 +97,8 @@ func createMetricsToMetrics( metricMetricDefs := make(map[string]metricDef[ottlmetric.TransformContext], len(c.Metrics)) for name, info := range c.Metrics { md := metricDef[ottlmetric.TransformContext]{ - desc: info.Description, + desc: info.Description, + sourceAttr: info.SourceAttribute, } if len(info.Conditions) > 0 { // Error checked in Config.Validate() @@ -108,8 +111,9 @@ func createMetricsToMetrics( dataPointMetricDefs := make(map[string]metricDef[ottldatapoint.TransformContext], len(c.DataPoints)) for name, info := range c.DataPoints { md := metricDef[ottldatapoint.TransformContext]{ - desc: info.Description, - attrs: info.Attributes, + desc: info.Description, + attrs: info.Attributes, + sourceAttr: info.SourceAttribute, } if len(info.Conditions) > 0 { // Error checked in Config.Validate() @@ -138,8 +142,9 @@ func createLogsToMetrics( metricDefs := make(map[string]metricDef[ottllog.TransformContext], len(c.Logs)) for name, info := range c.Logs { md := metricDef[ottllog.TransformContext]{ - desc: info.Description, - attrs: info.Attributes, + desc: info.Description, + attrs: info.Attributes, + sourceAttr: info.SourceAttribute, } if len(info.Conditions) > 0 { // Error checked in Config.Validate() @@ -156,7 +161,8 @@ func createLogsToMetrics( } type metricDef[K any] struct { - condition expr.BoolExpr[K] - desc string - attrs []AttributeConfig + condition expr.BoolExpr[K] + desc string + attrs []AttributeConfig + sourceAttr string } diff --git a/connector/sumconnector/go.mod b/connector/sumconnector/go.mod index a75b6b55a398..690cbd93f495 100644 --- a/connector/sumconnector/go.mod +++ b/connector/sumconnector/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/consumer v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/pdata v1.12.1-0.20240716231837-5753a58f712b go.uber.org/goleak v1.3.0 + go.uber.org/zap v1.27.0 ) require ( @@ -55,7 +56,6 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/sys v0.22.0 // indirect diff --git a/connector/sumconnector/testdata/config.yaml b/connector/sumconnector/testdata/config.yaml new file mode 100644 index 000000000000..d2a2bcb1de1c --- /dev/null +++ b/connector/sumconnector/testdata/config.yaml @@ -0,0 +1,182 @@ + sum: + sum/custom_description: + spans: + my.span.sum: + description: My span record sum. + source_attribute: my.attribute + spanevents: + my.spanevent.sum: + description: My spanevent sum. + source_attribute: my.attribute + metrics: + my.metric.sum: + description: My metric sum. + source_attribute: my.attribute + datapoints: + my.datapoint.sum: + description: My datapoint sum. + source_attribute: my.attribute + logs: + my.logrecord.sum: + description: My log sum. + source_attribute: my.attribute + sum/custom_metric: + spans: + my.span.sum: + source_attribute: my.attribute + spanevents: + my.spanevent.sum: + source_attribute: my.attribute + metrics: + my.metric.sum: + source_attribute: my.attribute + datapoints: + my.datapoint.sum: + source_attribute: my.attribute + logs: + my.logrecord.sum: + source_attribute: my.attribute + sum/condition: + spans: + my.span.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-s") + spanevents: + my.spanevent.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-e") + metrics: + my.metric.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-m") + datapoints: + my.datapoint.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-d") + logs: + my.logrecord.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-l") + sum/multiple_condition: + spans: + my.span.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-s") + - IsMatch(resource.attributes["foo"], "bar-s") + spanevents: + my.spanevent.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-e") + - IsMatch(resource.attributes["foo"], "bar-e") + metrics: + my.metric.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-m") + - IsMatch(resource.attributes["foo"], "bar-m") + datapoints: + my.datapoint.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-d") + - IsMatch(resource.attributes["foo"], "bar-d") + logs: + my.logrecord.sum: + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-l") + - IsMatch(resource.attributes["foo"], "bar-l") + sum/attribute: + spans: + my.span.sum: + source_attribute: my.attribute + attributes: + - key: env + spanevents: + my.spanevent.sum: + source_attribute: my.attribute + attributes: + - key: env + metrics: + my.metric.sum: + source_attribute: my.attribute + # Metrics do not have attributes. + datapoints: + my.datapoint.sum: + source_attribute: my.attribute + attributes: + - key: env + logs: + my.logrecord.sum: + source_attribute: my.attribute + attributes: + - key: env + sum/multiple_metrics: + spans: + my.span.sum: + description: My span sum. + source_attribute: my.attribute + limited.span.sum: + description: Limited span sum. + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-s") + attributes: + - key: env + - key: component + default_value: other + spanevents: + my.spanevent.sum: + description: My span event sum. + source_attribute: my.attribute + limited.spanevent.sum: + description: Limited span event sum. + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-e") + attributes: + - key: env + - key: component + default_value: other + metrics: + my.metric.sum: + description: My metric sum. + source_attribute: my.attribute + limited.metric.sum: + description: Limited metric sum. + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-m") + datapoints: + my.datapoint.sum: + description: My data point sum. + source_attribute: my.attribute + limited.datapoint.sum: + description: Limited data point sum. + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-d") + attributes: + - key: env + - key: component + default_value: other + logs: + my.logrecord.sum: + description: My log record sum. + source_attribute: my.attribute + limited.logrecord.sum: + description: Limited log record sum. + source_attribute: my.attribute + conditions: + - IsMatch(resource.attributes["host.name"], "pod-l") + attributes: + - key: env + - key: component + default_value: other \ No newline at end of file From 14923a84de33ba0f7ef151dbdd34f56f12ee1c08 Mon Sep 17 00:00:00 2001 From: Adam Charrett <73886859+adcharre@users.noreply.github.com> Date: Thu, 25 Jul 2024 20:17:51 +0100 Subject: [PATCH 27/30] awss3receiver: Remove use of deprecated AWS SDK v2 API (#34171) **Description:** Remove use of deprecated AWS SDK v2 Endpoint resolver API **Link to tracking Issue:** #30750 **Testing:** Tested against a locally running localstack instance. **Documentation:** N/A --- receiver/awss3receiver/s3intf.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/receiver/awss3receiver/s3intf.go b/receiver/awss3receiver/s3intf.go index b3b73d5bfd7a..ed2a869c93d6 100644 --- a/receiver/awss3receiver/s3intf.go +++ b/receiver/awss3receiver/s3intf.go @@ -37,17 +37,6 @@ func newS3Client(ctx context.Context, cfg S3DownloaderConfig) (ListObjectsAPI, G if cfg.Region != "" { optionsFuncs = append(optionsFuncs, config.WithRegion(cfg.Region)) } - - if cfg.Endpoint != "" { - customResolver := aws.EndpointResolverWithOptionsFunc(func(_, _ string, _ ...any) (aws.Endpoint, error) { - return aws.Endpoint{ - PartitionID: cfg.EndpointPartitionID, - URL: cfg.Endpoint, - SigningRegion: cfg.Region, - }, nil - }) - optionsFuncs = append(optionsFuncs, config.WithEndpointResolverWithOptions(customResolver)) - } awsCfg, err := config.LoadDefaultConfig(ctx, optionsFuncs...) if err != nil { log.Fatalf("unable to load SDK config, %v", err) @@ -59,6 +48,11 @@ func newS3Client(ctx context.Context, cfg S3DownloaderConfig) (ListObjectsAPI, G o.UsePathStyle = true }) } + if cfg.Endpoint != "" { + s3OptionFuncs = append(s3OptionFuncs, func(o *s3.Options) { + o.BaseEndpoint = aws.String(cfg.Endpoint) + }) + } client := s3.NewFromConfig(awsCfg, s3OptionFuncs...) return &s3ListObjectsAPIImpl{client: client}, client, nil From 98ae65b4824bb00801ee8533972f0c73e8b333dd Mon Sep 17 00:00:00 2001 From: Christos Markou Date: Fri, 26 Jul 2024 14:44:25 +0300 Subject: [PATCH 28/30] [connector/otlpjson] Move stability to alpha (#34253) **Description:** This is the 3rd PR for the new otlpjson connector (https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208). Moves its stability to `alpha`. **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34208 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34239 https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34249 **Testing:** ~ **Documentation:** Updated --------- Signed-off-by: ChrsMark --- .chloggen/otlpjsoncon_alpha.yaml | 27 +++++++++++++++++++ cmd/otelcontribcol/builder-config.yaml | 2 ++ cmd/otelcontribcol/components.go | 3 +++ cmd/otelcontribcol/go.mod | 3 +++ connector/otlpjsonconnector/README.md | 8 +++--- connector/otlpjsonconnector/config.go | 4 --- connector/otlpjsonconnector/config_test.go | 4 --- .../internal/metadata/generated_status.go | 6 ++--- connector/otlpjsonconnector/metadata.yaml | 3 ++- 9 files changed, 44 insertions(+), 16 deletions(-) create mode 100644 .chloggen/otlpjsoncon_alpha.yaml delete mode 100644 connector/otlpjsonconnector/config_test.go diff --git a/.chloggen/otlpjsoncon_alpha.yaml b/.chloggen/otlpjsoncon_alpha.yaml new file mode 100644 index 000000000000..d377ad1629a4 --- /dev/null +++ b/.chloggen/otlpjsoncon_alpha.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: otlpjsonconnector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Move connector's stability to alpha. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [34208, 34253] + +# (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: [user] diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 294d571463d3..68760fb25790 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -226,6 +226,7 @@ connectors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0 @@ -455,6 +456,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ../../connector/exceptionsconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector => ../../connector/failoverconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector + - github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector => ../../connector/otlpjsonconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector => ../../connector/roundrobinconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector - github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index fa9632185fff..be4d3c9376a3 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -27,6 +27,7 @@ import ( exceptionsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector" failoverconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector" grafanacloudconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector" + otlpjsonconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" roundrobinconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector" routingconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector" servicegraphconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" @@ -647,6 +648,7 @@ func components() (otelcol.Factories, error) { exceptionsconnector.NewFactory(), failoverconnector.NewFactory(), grafanacloudconnector.NewFactory(), + otlpjsonconnector.NewFactory(), roundrobinconnector.NewFactory(), routingconnector.NewFactory(), servicegraphconnector.NewFactory(), @@ -662,6 +664,7 @@ func components() (otelcol.Factories, error) { factories.ConnectorModules[exceptionsconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0" factories.ConnectorModules[failoverconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0" factories.ConnectorModules[grafanacloudconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0" + factories.ConnectorModules[otlpjsonconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0" factories.ConnectorModules[roundrobinconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0" factories.ConnectorModules[routingconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0" factories.ConnectorModules[servicegraphconnector.NewFactory().Type()] = "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0" diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 00664dc8a732..e8e9d339a13d 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -14,6 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector v0.105.0 + github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.105.0 @@ -1266,6 +1267,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/fail replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/grafanacloudconnector => ../../connector/grafanacloudconnector +replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector => ../../connector/otlpjsonconnector + replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector => ../../connector/roundrobinconnector replace github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector diff --git a/connector/otlpjsonconnector/README.md b/connector/otlpjsonconnector/README.md index 6e61f650932f..73a330e0898f 100644 --- a/connector/otlpjsonconnector/README.md +++ b/connector/otlpjsonconnector/README.md @@ -7,16 +7,16 @@ | Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fotlpjson%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aconnector%2Fotlpjson) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fotlpjson%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aconnector%2Fotlpjson) | | [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@djaglowski](https://www.github.com/djaglowski), [@ChrsMark](https://www.github.com/ChrsMark) | -[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha [contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib ## Supported Pipeline Types | [Exporter Pipeline Type] | [Receiver Pipeline Type] | [Stability Level] | | ------------------------ | ------------------------ | ----------------- | -| logs | metrics | [development] | -| logs | traces | [development] | -| logs | logs | [development] | +| logs | metrics | [alpha] | +| logs | traces | [alpha] | +| logs | logs | [alpha] | [Exporter Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#exporter-pipeline-type [Receiver Pipeline Type]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/connector/README.md#receiver-pipeline-type diff --git a/connector/otlpjsonconnector/config.go b/connector/otlpjsonconnector/config.go index 180fa353c5dd..509a2039283c 100644 --- a/connector/otlpjsonconnector/config.go +++ b/connector/otlpjsonconnector/config.go @@ -4,7 +4,3 @@ package otlpjsonconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector" type Config struct{} - -func (c *Config) Validate() error { - return nil -} diff --git a/connector/otlpjsonconnector/config_test.go b/connector/otlpjsonconnector/config_test.go deleted file mode 100644 index d594196c182b..000000000000 --- a/connector/otlpjsonconnector/config_test.go +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package otlpjsonconnector diff --git a/connector/otlpjsonconnector/internal/metadata/generated_status.go b/connector/otlpjsonconnector/internal/metadata/generated_status.go index dd3f763e24db..6d86f44cf5eb 100644 --- a/connector/otlpjsonconnector/internal/metadata/generated_status.go +++ b/connector/otlpjsonconnector/internal/metadata/generated_status.go @@ -11,7 +11,7 @@ var ( ) const ( - LogsToMetricsStability = component.StabilityLevelDevelopment - LogsToTracesStability = component.StabilityLevelDevelopment - LogsToLogsStability = component.StabilityLevelDevelopment + LogsToMetricsStability = component.StabilityLevelAlpha + LogsToTracesStability = component.StabilityLevelAlpha + LogsToLogsStability = component.StabilityLevelAlpha ) diff --git a/connector/otlpjsonconnector/metadata.yaml b/connector/otlpjsonconnector/metadata.yaml index c6927d232eee..2a7295154996 100644 --- a/connector/otlpjsonconnector/metadata.yaml +++ b/connector/otlpjsonconnector/metadata.yaml @@ -1,9 +1,10 @@ type: otlpjson +scope_name: otelcol/otlpjson status: class: connector stability: - development: [logs_to_metrics, logs_to_traces, logs_to_logs] + alpha: [logs_to_metrics, logs_to_traces, logs_to_logs] distributions: [contrib] codeowners: active: [djaglowski, ChrsMark] From 49cee31127431c23afd97657414a5c2a44c5c755 Mon Sep 17 00:00:00 2001 From: Arun Annamalai <36392755+arun-annamalai@users.noreply.github.com> Date: Fri, 26 Jul 2024 06:08:28 -0700 Subject: [PATCH 29/30] Update xrayexporter documentation on indexing attributes (#34183) **Description:** Adding Xray Exporter Documentation - Shows users how to use dynamically indexed attributes within the SDK with Xray **Link to tracking Issue:** https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/34182 **Testing:** N/A **Documentation:** Update xrayexporter documentation on indexing attributes --- exporter/awsxrayexporter/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exporter/awsxrayexporter/README.md b/exporter/awsxrayexporter/README.md index ccdf9175f711..cd9174c5a9bd 100644 --- a/exporter/awsxrayexporter/README.md +++ b/exporter/awsxrayexporter/README.md @@ -43,6 +43,7 @@ defined in the OpenTelemetry Semantic Conventions. | `aws.request_id` | AWS-generated unique identifier for the request. | No | | `aws.queue_url` | For operations on an Amazon SQS queue, the queue's URL. | No | | `aws.table_name` | For operations on a DynamoDB table, the name of the table. | No | +| `aws.xray.annotations` | The attribute is a slice(list) attribute that contains each of the string keys. If found on the span, the `awsxrayexporter` will use them in addition to the `indexed_attributes` configuration field when categorizing which attributes to index. This can be configured with `"aws.xray.annotations"=["key1", "key2"]` (Java example: `span.setAttribute(stringArrayKey("aws.xray.annotations"), List.of("key1", "key2"))`) | No | Any of these values supplied are used to populate the `aws` object in addition to any relevant data supplied by the Span Resource object. X-Ray uses this data to generate inferred segments for the remote APIs. From 1311344a90e5a21d2e9fb1fad12ed1a2ba22e0af Mon Sep 17 00:00:00 2001 From: Stanley Liu Date: Fri, 26 Jul 2024 09:09:15 -0400 Subject: [PATCH 30/30] [exporter/datadog] Fix duplicate sent log records in logs agent exporter (#33887) **Description:** We were calling `exporterhelper.NewLogsExporter` twice when instantiating the logs agent exporter: once in the datadogexporter factory method and once in the logs agent exporter factory method. This resulted in the `otelcol_exporter_sent_log_records` reporting double the amount of logs being sent. This PR removes the latter call by using `logsagentexporter.NewExporter` directly. **Link to tracking Issue:** **Testing:** Verified locally that `otelcol_exporter_sent_log_records` reports the correct number of sent logs now, and added integration test. **Documentation:** --- ...anley.liu_fix-logs-agent-sent-records.yaml | 27 +++ exporter/datadogexporter/go.mod | 4 +- .../datadogexporter/integrationtest/go.mod | 74 ++++++- .../datadogexporter/integrationtest/go.sum | 188 +++++++++++++++++- .../integrationtest/integration_test.go | 117 +++++++++++ .../integration_test_logs_config.yaml | 46 +++++ exporter/datadogexporter/logs_exporter.go | 17 +- 7 files changed, 455 insertions(+), 18 deletions(-) create mode 100644 .chloggen/stanley.liu_fix-logs-agent-sent-records.yaml create mode 100644 exporter/datadogexporter/integrationtest/integration_test_logs_config.yaml diff --git a/.chloggen/stanley.liu_fix-logs-agent-sent-records.yaml b/.chloggen/stanley.liu_fix-logs-agent-sent-records.yaml new file mode 100644 index 000000000000..26b66e918a78 --- /dev/null +++ b/.chloggen/stanley.liu_fix-logs-agent-sent-records.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: exporter/datadog + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Fixes a bug where `otelcol_exporter_sent_log_records` was reporting double as many logs sent when using the logs agent feature gate. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [33887] + +# (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/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 21e6dac994b6..e90d0c5c2e43 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/core/hostname/hostnameinterface v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/core/log v0.56.0-rc.6 - github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/comp/logs/agent/config v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl v0.56.0-rc.6 github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter v0.56.0-rc.6 @@ -21,6 +21,7 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/diagnostic v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/logs/pipeline v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/logs/sds v0.56.0-rc.6 // indirect + github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 github.com/DataDog/datadog-agent/pkg/logs/status/statusinterface v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/proto v0.56.0-rc.6 github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.6 // indirect @@ -114,7 +115,6 @@ require ( github.com/DataDog/datadog-agent/pkg/logs/metrics v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/logs/processor v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/logs/sender v0.56.0-rc.6 // indirect - github.com/DataDog/datadog-agent/pkg/logs/sources v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/logs/status/utils v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/obfuscate v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.56.0-rc.6 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index c55306291495..05a4c011df96 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -8,6 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.105.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.105.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.105.0 github.com/stretchr/testify v1.9.0 github.com/tinylib/msgp v1.2.0 go.opentelemetry.io/collector/component v0.105.1-0.20240717163034-43ed6184f9fe @@ -25,14 +26,25 @@ require ( go.opentelemetry.io/collector/receiver v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/collector/receiver/otlpreceiver v0.105.1-0.20240717163034-43ed6184f9fe go.opentelemetry.io/otel v1.28.0 + go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240719082549-d2d94d6ae589 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 go.opentelemetry.io/otel/sdk v1.28.0 + go.opentelemetry.io/otel/sdk/log v0.4.0 go.opentelemetry.io/otel/trace v1.28.0 google.golang.org/protobuf v1.34.2 ) require ( + cloud.google.com/go/auth v0.5.1 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect cloud.google.com/go/compute/metadata v0.5.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect + github.com/Code-Hex/go-generics-cache v1.5.1 // indirect github.com/DataDog/agent-payload/v5 v5.0.125 // indirect github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.6 // indirect github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.6 // indirect @@ -106,6 +118,8 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect + github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect + github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.53.16 // indirect github.com/benbjohnson/clock v1.3.5 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -114,46 +128,79 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect + github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b // indirect github.com/containerd/cgroups/v3 v3.0.3 // 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/dennwc/varint v1.0.0 // indirect + github.com/digitalocean/godo v1.117.0 // indirect + github.com/distribution/reference v0.5.0 // indirect + github.com/docker/docker v26.1.4+incompatible // indirect + github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/envoyproxy/go-control-plane v0.12.0 // indirect + github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect github.com/fatih/color v1.16.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.6.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-openapi/jsonpointer v0.20.2 // indirect github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/swag v0.22.9 // indirect + github.com/go-resty/resty/v2 v2.13.1 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect + github.com/go-zookeeper/zk v1.0.3 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.3 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect + github.com/google/s2a-go v0.1.7 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect + github.com/googleapis/gax-go/v2 v2.12.4 // indirect + github.com/gophercloud/gophercloud v1.12.0 // indirect + github.com/gorilla/websocket v1.5.0 // indirect + github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/hashicorp/consul/api v1.29.2 // indirect + github.com/hashicorp/cronexpr v1.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/go-version v1.7.0 // indirect + github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/nomad/api v0.0.0-20240604134157-e73d8bb1140d // indirect + github.com/hashicorp/serf v0.10.1 // indirect github.com/hectane/go-acl v0.0.0-20190604041725-da78bae5fc95 // indirect + github.com/hetznercloud/hcloud-go/v2 v2.9.0 // indirect github.com/iancoleman/strcase v0.3.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/ionos-cloud/sdk-go/v6 v6.1.11 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect + github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect github.com/karrick/godirwalk v1.17.0 // indirect @@ -161,19 +208,26 @@ require ( github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.1 // indirect + github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/linode/linodego v1.35.0 // indirect github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect + github.com/miekg/dns v1.1.59 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect github.com/mostynb/go-grpc-compression v1.2.3 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.105.0 // indirect @@ -181,22 +235,31 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.105.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.105.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.105.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.105.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // 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 + github.com/ovh/go-ovh v1.5.1 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect github.com/prometheus/client_golang v1.19.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect + github.com/prometheus/prometheus v0.53.1 // indirect github.com/rs/cors v1.11.0 // indirect + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.27 // indirect github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect github.com/shirou/gopsutil/v3 v3.24.5 // indirect github.com/shirou/gopsutil/v4 v4.24.6 // indirect @@ -210,6 +273,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect + github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector v0.105.1-0.20240717163034-43ed6184f9fe // indirect @@ -250,7 +314,6 @@ require ( go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.28.0 // indirect go.opentelemetry.io/otel/log v0.4.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk/log v0.4.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect go.opentelemetry.io/proto/otlp v1.3.1 // indirect go.uber.org/atomic v1.11.0 // indirect @@ -258,16 +321,21 @@ require ( go.uber.org/fx v1.18.2 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/mod v0.18.0 // indirect golang.org/x/net v0.27.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/term v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.22.0 // indirect gonum.org/v1/gonum v0.15.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect + google.golang.org/api v0.183.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect google.golang.org/grpc v1.65.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 7e4978036fd6..953e881b73f3 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -16,7 +16,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0 h1:XgtDnVJRCPEUG21gjFiRPz4zI1Mjg16R+NYQjfmU4XY= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/auth v0.5.1 h1:0QNO7VThG54LUzKiQxv8C6x1YX7lUrzlAa1nVLF8CIw= cloud.google.com/go/auth v0.5.1/go.mod h1:vbZT8GjzDf3AVqCcQmqeeM32U9HBFc32vVVAbwDsa6s= @@ -51,8 +50,14 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hw github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0 h1:LkHbJbgF3YyvC53aqYGR+wWQDn2Rdp9AQdGndf9QvY4= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5 v5.7.0/go.mod h1:QyiQdW4f4/BIfB8ZutZ2s+28RAgfa/pT+zS++ZHyM1I= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0/go.mod h1:LRr2FzBTQlONPPa5HREE5+RjSCTXl7BwOvYOaWTqCaI= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0 h1:bXwSugBiSbgtz7rOtbfGf+woewp4f06orW9OP5BjHLA= github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork/v4 v4.3.0/go.mod h1:Y/HgrePTmGy9HjdSGTqZNa+apUpTVIEVKXJyARP2lrk= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1 h1:7CBQ+Ei8SP2c6ydQTGCCrS35bDxgTMfoP2miAwK++OU= +github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.1.1/go.mod h1:c/wcGeGx5FUPbM/JltUYHZcKmigwyVLJlDq+4HdtXaw= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= @@ -196,6 +201,7 @@ github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6 h1:RqOa8G/MlCoH4Joxumu github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.6/go.mod h1:EHeMJExE74SMdRoRCEuLOxbRgjfQwCVngMqFBiz1VN8= github.com/DataDog/datadog-api-client-go/v2 v2.28.0 h1:seA/bTwKnB/7ELtZrXIw5csksdR78eGtMrpOUK5XJKA= github.com/DataDog/datadog-api-client-go/v2 v2.28.0/go.mod h1:QKOu6vscsh87fMY1lHfLEmNSunyXImj8BUaUWJXOehc= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/datadog-go/v5 v5.5.0 h1:G5KHeB8pWBNXT4Jtw0zAkhdxEAWSpWH00geHI6LDrKU= github.com/DataDog/datadog-go/v5 v5.5.0/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw= github.com/DataDog/dd-sensitive-data-scanner/sds-go/go v0.0.0-20240419161837-f1b2f553edfe h1:efzxujZ7VHWFxjmWjcJyUEpPrN8qdiZPYb+dBw547Wo= @@ -245,21 +251,30 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.53.16 h1:8oZjKQO/ml1WLUZw5hvF7pvYjPf8o9f57Wldoy/q9Qc= github.com/aws/aws-sdk-go v1.53.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 h1:6df1vn4bBlDDo4tARvBm7l6KA9iVMnE3NWizDeWSrps= +github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3/go.mod h1:CIWtjkly68+yqLPbvwwR/fjNJA/idrtULjZWh2v1ys0= github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o= github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I= github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A= @@ -279,6 +294,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn github.com/cihub/seelog v0.0.0-20151216151435-d2c6e5aa9fbf/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= 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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= 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-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -287,6 +304,8 @@ github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b h1:ga8SEFjZ60pxLcmhnTh github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8= github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/bbolt v1.3.3/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -314,6 +333,8 @@ github.com/digitalocean/godo v1.117.0 h1:WVlTe09melDYTd7VCVyvHcNWbgB+uI1O115+5LO github.com/digitalocean/godo v1.117.0/go.mod h1:Vk0vpCot2HOAJwc5WE8wljZGtJ3ZtWIc8MQ8rF38sdo= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= +github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU= github.com/docker/docker v26.1.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -340,8 +361,13 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/expr-lang/expr v1.16.9 h1:WUAzmR0JNI9JCiF0/ewwHB1gmcGw5wW7nWt8gc6PpCI= github.com/expr-lang/expr v1.16.9/go.mod h1:8/vRC7+7HBzESEqt5kKpYXxrxkr31SaO8r40VO/1IT4= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -358,10 +384,12 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= @@ -448,6 +476,8 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -460,6 +490,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -483,8 +514,8 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 h1:y3N7Bm7Y9/CtpiVkw/ZWj6lSlDF3F74SfKwfTCer72Q= -github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20240528025155-186aa0362fba h1:ql1qNgCyOB7iAEk8JTNM+zJrgIbnyCKX/wdlyPufP5g= +github.com/google/pprof v0.0.0-20240528025155-186aa0362fba/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= @@ -519,23 +550,43 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/consul/api v1.29.2 h1:aYyRn8EdE2mSfG14S1+L9Qkjtz8RzmaWh6AcNGRNwPw= github.com/hashicorp/consul/api v1.29.2/go.mod h1:0YObcaLNDSbtlgzIRtmRXI1ZkeuK0trCBxwZQ4MYnIk= +github.com/hashicorp/consul/proto-public v0.6.2 h1:+DA/3g/IiKlJZb88NBn0ZgXrxJp2NlvCZdEyl+qxvL0= +github.com/hashicorp/consul/proto-public v0.6.2/go.mod h1:cXXbOg74KBNGajC+o8RlA502Esf0R9prcoJgiOX/2Tg= +github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= +github.com/hashicorp/consul/sdk v0.16.1/go.mod h1:fSXvwxB2hmh1FMZCNl6PwX0Q/1wdWtHJcZ7Ea5tns0s= github.com/hashicorp/cronexpr v1.1.2 h1:wG/ZYIKT+RT3QkOdgYc+xsKWVRgnxJ1OJtjjy84fJ9A= github.com/hashicorp/cronexpr v1.1.2/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= +github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= +github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8= +github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -546,6 +597,10 @@ github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM= +github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/nomad/api v0.0.0-20240604134157-e73d8bb1140d h1:KHq+mAzWSkumj4PDoXc5VZbycPGcmYu8tohgVLQ6SIc= github.com/hashicorp/nomad/api v0.0.0-20240604134157-e73d8bb1140d/go.mod h1:svtxn6QnrQ69P23VvIWMR34tg3vmwLz4UdUzm1dSCgE= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= @@ -568,6 +623,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/ionos-cloud/sdk-go/v6 v6.1.11 h1:J/uRN4UWO3wCyGOeDdMKv8LWRzKu6UIkLEaes38Kzh8= github.com/ionos-cloud/sdk-go/v6 v6.1.11/go.mod h1:EzEgRIDxBELvfoa/uBN0kOQaqovLjUWEB7iW4/Q+t4k= +github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= +github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= @@ -582,12 +639,14 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA= github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/karrick/godirwalk v1.17.0 h1:b4kY7nqDdioR/6qnbHQyDvmA17u5G1cZ6J+CZXwSWoI= @@ -607,6 +666,7 @@ github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkX github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b h1:udzkj9S/zlT5X367kqJis0QP7YMxobob6zhzq6Yre00= github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= 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= @@ -639,18 +699,36 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g= +github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs= github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -659,6 +737,8 @@ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= +github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= 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= @@ -668,6 +748,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9M+97sNutRR1RKhG96O6jWumTTnw= github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mostynb/go-grpc-compression v1.2.3 h1:42/BKWMy0KEJGSdWvzqIyOZ95YcR9mLPqKctH7Uo//I= github.com/mostynb/go-grpc-compression v1.2.3/go.mod h1:AghIxF3P57umzqM9yz795+y1Vjs47Km/Y2FE6ouQ7Lg= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= @@ -678,6 +760,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= 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/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= 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= @@ -706,6 +789,9 @@ github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR github.com/outcaste-io/ristretto v0.2.1/go.mod h1:W8HywhmtlopSB1jeMg3JtdIhf+DYkLAr0VN/s4+MHac= github.com/ovh/go-ovh v1.5.1 h1:P8O+7H+NQuFK9P/j4sFW5C0fvSS2DnHYGPwdVCp45wI= github.com/ovh/go-ovh v1.5.1/go.mod h1:cTVDnl94z4tl8pP1uZ/8jlVxntjSIf09bNcQ5TJSC7c= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= +github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= 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/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -724,6 +810,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/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= @@ -732,7 +820,10 @@ github.com/prometheus-community/windows_exporter v0.25.1/go.mod h1:fmM+2zsneBex4 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.4.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -745,6 +836,9 @@ github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7q github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= @@ -753,6 +847,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/prometheus v0.53.1 h1:B0xu4VuVTKYrIuBMn/4YSUoIPYxs956qsOfcS4rqCuA= @@ -766,8 +862,11 @@ github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99 github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po= github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.27 h1:yGAraK1uUjlhSXgNMIy8o/J4LFNcy7yeipBqt9N9mVg= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.27/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= +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.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.12/go.mod h1:Xd7P1kwZcp5VW52+9XsirIKd/BROzbb2wdX3Kqlz9uI= @@ -777,11 +876,14 @@ github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckyS github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= -github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU= -github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k= +github.com/shoenig/test v1.7.1 h1:UJcjSAI3aUKx52kfcfhblgyhZceouhvvs3OYdWgn+PY= +github.com/shoenig/test v1.7.1/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -818,12 +920,23 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 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.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= 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.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo= +github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= +github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= +github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= +github.com/tidwall/tinylru v1.1.0 h1:XY6IUfzVTU9rpwdhKUF6nQdChgCdGjkMfLzbWyiau6I= +github.com/tidwall/tinylru v1.1.0/go.mod h1:3+bX+TJ2baOLMWTnlyNWHh4QMnFyARg2TLTQ6OFbzw8= +github.com/tidwall/wal v1.1.7 h1:emc1TRjIVsdKKSnpwGBAcsAGg0767SvUk8+ygx7Bb+4= +github.com/tidwall/wal v1.1.7/go.mod h1:r6lR1j27W9EPalgHiB7zLJDYu3mzW5BQP5KrzBpYY/E= github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI= @@ -834,6 +947,7 @@ github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+F github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= @@ -852,6 +966,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/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/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= @@ -960,6 +1075,8 @@ go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/bridge/opencensus v1.28.0 h1:/BcyAV1bUJjSVxoeKwTQL9cS4X1iC6izZ9mheeuVSCU= go.opentelemetry.io/otel/bridge/opencensus v1.28.0/go.mod h1:FZp2xE+46yAyp3DfLFALze58nY0iIE8zs+mCgkPAzq0= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240719082549-d2d94d6ae589 h1:kjE/xEx9hC6O3r+hWP1O3bgBFVldtwVGNNY/dcntlZE= +go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.0.0-20240719082549-d2d94d6ae589/go.mod h1:rW8ltr6KoR3Rrl0/qiEnuUBXPYME0z5YCwO2pKsmOpc= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 h1:zBPZAISA9NOc5cE8zydqDiS0itvg/P/0Hn9m72a5gvM= go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0/go.mod h1:gcj2fFjEsqpV3fXuzAA+0Ze1p2/4MJ4T7d77AmkvueQ= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk= @@ -1017,12 +1134,17 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/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-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1062,6 +1184,8 @@ golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hM golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/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.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1082,6 +1206,7 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/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-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1105,7 +1230,14 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= 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-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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1117,6 +1249,7 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1130,14 +1263,18 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/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.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +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-20181107165924-66b7b1311ac8/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-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/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= @@ -1149,11 +1286,15 @@ golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7w 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-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-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/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= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1165,6 +1306,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w 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-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-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1175,25 +1318,41 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w 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= +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-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/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-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/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.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/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.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1204,6 +1363,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/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.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1229,6 +1392,7 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1269,6 +1433,8 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/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= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1344,10 +1510,10 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY= +google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1378,6 +1544,7 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -1403,6 +1570,7 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.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= @@ -1410,6 +1578,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 h1:umQdVO0Ytx+kYadhuJNjFtDgIsIEBnKrOTvNuu8ClKI= gopkg.in/zorkian/go-datadog-api.v2 v2.30.0/go.mod h1:kx0CSMRpzEZfx/nFH62GLU4stZjparh/BRpM89t4XCQ= +gotest.tools/v3 v3.2.0 h1:I0DwBVMGAx26dttAj1BtJLAkVGncrkkUXfJLC4Flt/I= +gotest.tools/v3 v3.2.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/exporter/datadogexporter/integrationtest/integration_test.go b/exporter/datadogexporter/integrationtest/integration_test.go index 830587929e81..f7082685ecb0 100644 --- a/exporter/datadogexporter/integrationtest/integration_test.go +++ b/exporter/datadogexporter/integrationtest/integration_test.go @@ -7,9 +7,12 @@ import ( "bytes" "compress/gzip" "context" + "encoding/json" "fmt" "io" + "net/http" "strings" + "sync" "testing" "time" @@ -34,7 +37,9 @@ import ( "go.opentelemetry.io/collector/receiver/otlpreceiver" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" + "go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" + "go.opentelemetry.io/otel/sdk/log" "go.opentelemetry.io/otel/sdk/resource" sdktrace "go.opentelemetry.io/otel/sdk/trace" apitrace "go.opentelemetry.io/otel/trace" @@ -43,8 +48,26 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver" ) +// seriesMap represents an unmarshalled series payload +type seriesMap struct { + Series []series +} + +// series represents a metric series map +type series struct { + Metric string + Points []point +} + +// point represents a series metric datapoint +type point struct { + Timestamp int + Value float64 +} + func TestIntegration_NativeOTelAPMStatsIngest(t *testing.T) { previousVal := datadogconnector.NativeIngestFeatureGate.IsEnabled() err := featuregate.GlobalRegistry().Set(datadogconnector.NativeIngestFeatureGate.ID(), true) @@ -135,6 +158,7 @@ func getIntegrationTestComponents(t *testing.T) otelcol.Factories { factories.Receivers, err = receiver.MakeFactoryMap( []receiver.Factory{ otlpreceiver.NewFactory(), + prometheusreceiver.NewFactory(), }..., ) require.NoError(t, err) @@ -414,3 +438,96 @@ func sendTracesComputeTopLevelBySpanKind(t *testing.T) { } time.Sleep(1 * time.Second) } + +func TestIntegrationLogs(t *testing.T) { + // 1. Set up mock Datadog server + // See also https://github.com/DataDog/datadog-agent/blob/49c16e0d4deab396626238fa1d572b684475a53f/cmd/trace-agent/test/backend.go + seriesRec := &testutil.HTTPRequestRecorderWithChan{Pattern: testutil.MetricV2Endpoint, ReqChan: make(chan []byte)} + doneChannel := make(chan bool) + var connectivityCheck sync.Once + var logsData testutil.JSONLogs + server := testutil.DatadogLogServerMock(seriesRec.HandlerFunc, func() (string, http.HandlerFunc) { + return "/api/v2/logs", func(w http.ResponseWriter, r *http.Request) { + doneConnectivityCheck := false + connectivityCheck.Do(func() { + // The logs agent performs a connectivity check upon initialization. + // This function mocks a successful response for the first request received. + w.WriteHeader(http.StatusAccepted) + doneConnectivityCheck = true + }) + if !doneConnectivityCheck { + jsonLogs := testutil.ProcessLogsAgentRequest(w, r) + logsData = append(logsData, jsonLogs...) + doneChannel <- true + } + } + }) + defer server.Close() + t.Setenv("SERVER_URL", server.URL) + + // 2. Start in-process collector + assert.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.UseLogsAgentExporter", true)) + defer func() { + assert.NoError(t, featuregate.GlobalRegistry().Set("exporter.datadogexporter.UseLogsAgentExporter", false)) + }() + factories := getIntegrationTestComponents(t) + app := getIntegrationTestCollector(t, "integration_test_logs_config.yaml", factories) + go func() { + assert.NoError(t, app.Run(context.Background())) + }() + defer app.Shutdown() + + waitForReadiness(app) + + // 3. Generate and send logs + sendLogs(t, 5) + + // 4. Validate logs and metrics from the mock server + // Wait until `doneChannel` is closed and prometheus metrics are received. + var metricMap seriesMap + for len(metricMap.Series) < 4 { + select { + case <-doneChannel: + assert.Len(t, logsData, 5) + case metricsBytes := <-seriesRec.ReqChan: + var smap seriesMap + gz := getGzipReader(t, metricsBytes) + dec := json.NewDecoder(gz) + assert.NoError(t, dec.Decode(&smap)) + for _, s := range smap.Series { + if s.Metric == "otelcol_receiver_accepted_log_records" || s.Metric == "otelcol_exporter_sent_log_records" { + metricMap.Series = append(metricMap.Series, s) + } + } + case <-time.After(60 * time.Second): + t.Fail() + } + } + + // 5. Validate mock server received expected otelcol metric values + numAcceptedLogRecords := 0 + numSentLogRecords := 0 + assert.Len(t, metricMap.Series, 4) + for _, s := range metricMap.Series { + if s.Metric == "otelcol_receiver_accepted_log_records" { + numAcceptedLogRecords++ + assert.Len(t, s.Points, 1) + assert.Equal(t, s.Points[0].Value, 5.0) + } + if s.Metric == "otelcol_exporter_sent_log_records" { + numSentLogRecords++ + assert.Len(t, s.Points, 1) + assert.Equal(t, s.Points[0].Value, 5.0) + } + } + assert.Equal(t, 2, numAcceptedLogRecords) + assert.Equal(t, 2, numSentLogRecords) +} + +func sendLogs(t *testing.T, numLogs int) { + ctx := context.Background() + logExporter, err := otlploggrpc.New(ctx, otlploggrpc.WithInsecure()) + assert.NoError(t, err) + lr := make([]log.Record, numLogs) + assert.NoError(t, logExporter.Export(ctx, lr)) +} diff --git a/exporter/datadogexporter/integrationtest/integration_test_logs_config.yaml b/exporter/datadogexporter/integrationtest/integration_test_logs_config.yaml new file mode 100644 index 000000000000..c9fd88844a9f --- /dev/null +++ b/exporter/datadogexporter/integrationtest/integration_test_logs_config.yaml @@ -0,0 +1,46 @@ + +receivers: + otlp: + protocols: + http: + endpoint: "localhost:4318" + grpc: + endpoint: "localhost:4317" + prometheus: + config: + scrape_configs: + - job_name: 'otelcol' + scrape_interval: 1s + static_configs: + - targets: [ 'localhost:8888' ] + metric_relabel_configs: + - source_labels: [ __name__ ] + regex: "(otelcol_receiver_accepted_log_records|otelcol_exporter_sent_log_records)" + action: keep + +exporters: + datadog: + api: + key: "key" + tls: + insecure_skip_verify: true + host_metadata: + enabled: false + logs: + endpoint: ${env:SERVER_URL} + metrics: + endpoint: ${env:SERVER_URL} + sums: + cumulative_monotonic_mode: raw_value + +service: + telemetry: + metrics: + level: basic + pipelines: + logs: + receivers: [otlp] + exporters: [datadog] + metrics: + receivers: [prometheus] + exporters: [datadog] \ No newline at end of file diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index ea5eaf2c10b4..784db1572889 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -8,9 +8,11 @@ import ( "fmt" "sync" + "github.com/DataDog/datadog-agent/comp/logs/agent/config" "github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline" "github.com/DataDog/datadog-agent/comp/otelcol/logsagentpipeline/logsagentpipelineimpl" "github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/exporter/logsagentexporter" + "github.com/DataDog/datadog-agent/pkg/logs/sources" "github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes" "github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes/source" @@ -127,7 +129,7 @@ func newLogsAgentExporter( params exporter.Settings, cfg *Config, sourceProvider source.Provider, -) (logsagentpipeline.LogsAgent, exporter.Logs, error) { +) (logsagentpipeline.LogsAgent, *logsagentexporter.Exporter, error) { logComponent := newLogComponent(params.TelemetrySettings) cfgComponent := newConfigComponent(params.TelemetrySettings, cfg) logsAgentConfig := &logsagentexporter.Config{ @@ -142,12 +144,19 @@ func newLogsAgentExporter( }) err := logsAgent.Start(ctx) if err != nil { - return nil, nil, fmt.Errorf("failed to create logs agent: %w", err) + return nil, &logsagentexporter.Exporter{}, fmt.Errorf("failed to create logs agent: %w", err) } + pipelineChan := logsAgent.GetPipelineProvider().NextPipelineChan() - logsAgentExporter, err := logsagentexporter.NewFactory(pipelineChan).CreateLogsExporter(ctx, params, logsAgentConfig) + logSource := sources.NewLogSource(logsAgentConfig.LogSourceName, &config.LogsConfig{}) + attributesTranslator, err := attributes.NewTranslator(params.TelemetrySettings) + if err != nil { + return nil, &logsagentexporter.Exporter{}, fmt.Errorf("failed to create attribute translator: %w", err) + } + + logsAgentExporter, err := logsagentexporter.NewExporter(params.TelemetrySettings, logsAgentConfig, logSource, pipelineChan, attributesTranslator) if err != nil { - return nil, nil, fmt.Errorf("failed to create logs agent exporter: %w", err) + return nil, &logsagentexporter.Exporter{}, fmt.Errorf("failed to create logs agent exporter: %w", err) } return logsAgent, logsAgentExporter, nil }