From 952bfd8cbdae950bc8ce103a8db8eb6d535a3ec0 Mon Sep 17 00:00:00 2001 From: Dominik Rosiek <58699848+sumo-drosiek@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:39:58 +0100 Subject: [PATCH 01/18] New component: Sumo Logic extension (#29603) **Description:** Adds new component (sumologicextension). This is only factory and configuration PR **Link to tracking Issue:** #29601 **Testing:** N/A **Documentation:** - readme - metadata.yaml --------- Signed-off-by: Dominik Rosiek Co-authored-by: Antoine Toulme Co-authored-by: Andrzej Stencel --- .chloggen/drosiek-sumologicextension.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 + extension/sumologicextension/.gitignore | 1 + extension/sumologicextension/Makefile | 1 + extension/sumologicextension/README.md | 163 ++++++++++++++++++ extension/sumologicextension/config.go | 95 ++++++++++ extension/sumologicextension/extension.go | 33 ++++ extension/sumologicextension/factory.go | 56 ++++++ extension/sumologicextension/factory_test.go | 62 +++++++ extension/sumologicextension/go.mod | 65 +++++++ extension/sumologicextension/go.sum | 157 +++++++++++++++++ .../internal/metadata/generated_status.go | 22 +++ extension/sumologicextension/metadata.yaml | 9 + reports/distributions/sumo.yaml | 1 + versions.yaml | 1 + 18 files changed, 697 insertions(+) create mode 100755 .chloggen/drosiek-sumologicextension.yaml create mode 100644 extension/sumologicextension/.gitignore create mode 100644 extension/sumologicextension/Makefile create mode 100644 extension/sumologicextension/README.md create mode 100644 extension/sumologicextension/config.go create mode 100644 extension/sumologicextension/extension.go create mode 100644 extension/sumologicextension/factory.go create mode 100644 extension/sumologicextension/factory_test.go create mode 100644 extension/sumologicextension/go.mod create mode 100644 extension/sumologicextension/go.sum create mode 100644 extension/sumologicextension/internal/metadata/generated_status.go create mode 100644 extension/sumologicextension/metadata.yaml diff --git a/.chloggen/drosiek-sumologicextension.yaml b/.chloggen/drosiek-sumologicextension.yaml new file mode 100755 index 000000000000..3e48468596c2 --- /dev/null +++ b/.chloggen/drosiek-sumologicextension.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: sumologicextension + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add configuration and readme + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29601] + +# (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/.github/CODEOWNERS b/.github/CODEOWNERS index 5395976652bd..af10a21eef5b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -112,6 +112,7 @@ extension/solarwindsapmsettingsextension/ @open-telemetry/collect extension/storage/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme @djaglowski extension/storage/dbstorage/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme extension/storage/filestorage/ @open-telemetry/collector-contrib-approvers @djaglowski +extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @astencel-sumo @sumo-drosiek @swiatekm-sumo internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index d3c35ae45fe0..240353d41255 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -111,6 +111,7 @@ body: - extension/storage - extension/storage/dbstorage - extension/storage/filestorage + - extension/sumologic - internal/aws - internal/collectd - internal/core diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index e8b8e3016828..53d0f8669bc1 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -105,6 +105,7 @@ body: - extension/storage - extension/storage/dbstorage - extension/storage/filestorage + - extension/sumologic - internal/aws - internal/collectd - internal/core diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index cf03cb515b3e..4e12e345b64a 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -105,6 +105,7 @@ body: - extension/storage - extension/storage/dbstorage - extension/storage/filestorage + - extension/sumologic - internal/aws - internal/collectd - internal/core diff --git a/extension/sumologicextension/.gitignore b/extension/sumologicextension/.gitignore new file mode 100644 index 000000000000..016382001e45 --- /dev/null +++ b/extension/sumologicextension/.gitignore @@ -0,0 +1 @@ +coverage.* diff --git a/extension/sumologicextension/Makefile b/extension/sumologicextension/Makefile new file mode 100644 index 000000000000..ded7a36092dc --- /dev/null +++ b/extension/sumologicextension/Makefile @@ -0,0 +1 @@ +include ../../Makefile.Common diff --git a/extension/sumologicextension/README.md b/extension/sumologicextension/README.md new file mode 100644 index 000000000000..a930b227280b --- /dev/null +++ b/extension/sumologicextension/README.md @@ -0,0 +1,163 @@ +# Sumo Logic Extension + +| Status | | +| ------------- |-----------| +| Stability | [development] | +| Distributions | [sumo] | +| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fsumologic%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fsumologic) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fsumologic%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fsumologic) | +| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@astencel-sumo](https://www.github.com/astencel-sumo), [@sumo-drosiek](https://www.github.com/sumo-drosiek), [@swiatekm-sumo](https://www.github.com/swiatekm-sumo) | + +[development]: https://github.com/open-telemetry/opentelemetry-collector#development +[sumo]: https://github.com/SumoLogic/sumologic-otel-collector + + +This extension is to be used in conjunction with +[`sumologicexporter`][sumologicexporter] in order to export telemetry data to +[Sumo Logic][sumologic]. + +It manages: + +- authentication (passing the provided credentials to `sumologicexporter` + when configured as extension in the same service) +- registration (storing the registration info locally after successful registration + for later use) +- heartbeats + +[sumologicexporter]: ../../exporter/sumologicexporter/ +[sumologic]: https://www.sumologic.com/ + +## Implementation + +It implements [`HTTPClientAuthenticator`][httpclientauthenticator] +and can be used as an authenticator for the +[`configauth.Authentication`][configauth_authentication] option for HTTP clients. + +[httpclientauthenticator]: https://github.com/open-telemetry/opentelemetry-collector/blob/2e84285efc665798d76773b9901727e8836e9d8f/config/configauth/clientauth.go#L34-L39 +[configauth_authentication]: https://github.com/open-telemetry/opentelemetry-collector/blob/3f5c7180c51ed67a6f54158ede5e523822e9659e/config/configauth/configauth.go#L29-L33 + +## Configuration + +- `installation_token`: (required) collector installation token for the Sumo Logic service, see + [help][credentials_help] for more details +- `collector_name`: name that will be used for registration; by default the hostname is used. In the event of a conflict, a timestamp will be appended to the name. See [here][clobber] for more information. +- `collector_description`: collector description that will be used for registration +- `collector_category`: collector category that will be used for registration +- `collector_fields`: a map of key value pairs that will be used as collector + fields that will be used for registration. + For more information on this subject please visit [this help document][fields_help] +- `discover_collector_tags`: defines whether to auto-discover collector metadata + tags (for local services, e.g. mysql) (default: `true`) + + **NOTE**: collector metadata tag auto-discovery is an alpha feature. +- `api_base_url`: base API URL that will be used for creating API requests, + see [API URLs](#api-urls) details + (default: `https://open-collectors.sumologic.com`) +- `heartbeat_interval`: interval that will be used for sending heartbeats + (default: `15s`) +- `collector_credentials_directory`: directory where state files with registration + info will be stored after successful collector registration + (default: `$HOME/.sumologic-otel-collector`) +- `clobber`: defines whether to delete any existing collector with the same name. See [here][clobber] for more information. +- `force_registration`: defines whether to force registration every time the + collector starts. + This will cause the collector to not look at the locally stored credentials + and to always reach out to API to register itself. (default: `false`) + + **NOTE**: if clobber is unset (default) then setting this to true will create + a new collector (with new unique name) on Sumo UI on every collector start + and create a new one upon registration. +- `ephemeral`: defines whether the collector will be deleted after 12 hours + of inactivity (default: `false`) +- `time_zone`: defines the time zone of the collector, for example "America/Los_Angeles". + For a list of all possible values, refer to the `TZ identifier` column in + https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List +- `backoff`: defines backoff mechanism for retry in case of failed registration. + [Exponential algorithm](https://pkg.go.dev/github.com/cenkalti/backoff/v4#ExponentialBackOff) is being used. + - `initial_interval` - initial interval of backoff (default: `500ms`) + - `max_interval` - maximum interval of backoff (default: `1m`) + - `max_elapsed_time` - time after which registration fails definitely (default: `15m`) + +[credentials_help]: https://help.sumologic.com/docs/manage/security/installation-tokens +[fields_help]: https://help.sumologic.com/docs/manage/fields +[clobber]: https://help.sumologic.com/docs/send-data/installed-collectors/collector-installation-reference/force-collectors-name-clobber/ + +## Example Config + +```yaml +extensions: + sumologic: + installation_token: + collector_name: my_collector + time_zone: Europe/Warsaw + +receivers: + hostmetrics: + collection_interval: 30s + scrapers: + load: + +processors: + +exporters: + sumologic: + auth: + authenticator: sumologic # Specify the name of the authenticator extension + +service: + extensions: [sumologic] + pipelines: + metrics: + receivers: [hostmetrics] + processors: [] + exporters: [sumologic] +``` + +## API URLs + +When integrating the extension with different Sumo Logic deployment that the +default one (i.e. `https://open-collectors.sumologic.com`) one needs to specify +the base API URL in the configuration (via `api_base_url` option) in order to +specify against which URL the agent will be authenticating against. + +Here is a list of valid values for this configuration option: + +| Deployment | API base URL | +|:-------------:|---------------------------------------------| +| default/`US1` | `https://open-collectors.sumologic.com` | +| `US2` | `https://open-collectors.us2.sumologic.com` | +| `AU` | `https://open-collectors.au.sumologic.com` | +| `DE` | `https://open-collectors.de.sumologic.com` | +| `EU` | `https://open-collectors.eu.sumologic.com` | +| `JP` | `https://open-collectors.jp.sumologic.com` | +| `CA` | `https://open-collectors.ca.sumologic.com` | +| `IN` | `https://open-collectors.in.sumologic.com` | + +## Storing credentials + +When collector is starting for the first time, Sumo Logic extension is using the `installation_token` +to register the collector with API. +Upon registration, the extension gets collector credentials which are used to authenticate the collector +when sending request to API (heartbeats, sending data etc). + +Credentials are stored on local filesystem to be reused when collector gets restarted (to prevent re-registration). +The path that's used to store the credentials files is configured via `collector_credentials_directory` which is by default +set to `$HOME/.sumologic-otel-collector`. + +Name of that file that contains the credentials is created in the following manner: + +```go +filename := hash(collector_name, installation_token, api_base_url) +``` + +This mechanism allows to keep the state of the collector (whether it is registered or not). +When collector is restarting it checks if the state file exists in `collector_credentials_directory`. + +If one would like to register another collector on the same machine then `collector_name` configuration property +has to be specified in order to register the collector under that specific name which will be used to create +a separate state file. + +### Running the collector as systemd service + +Systemd services are often run as users without a home directory, +so if the collector is run as such service, the credentials might not be stored properly. One should either make sure that the home directory exists for the user +or change the store location to another directory. diff --git a/extension/sumologicextension/config.go b/extension/sumologicextension/config.go new file mode 100644 index 000000000000..5e0af95c2cfb --- /dev/null +++ b/extension/sumologicextension/config.go @@ -0,0 +1,95 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sumologicextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" + +import ( + "time" + + "go.opentelemetry.io/collector/config/confighttp" + "go.opentelemetry.io/collector/config/configopaque" +) + +// Config has the configuration for the sumologic extension. +type Config struct { + // squash ensures fields are correctly decoded in embedded struct. + confighttp.HTTPClientSettings `mapstructure:",squash"` + + // Credentials contains Installation Token for Sumo Logic service. + // Please refer to https://help.sumologic.com/docs/manage/security/installation-tokens + // for detailed instructions how to obtain the token. + Credentials accessCredentials `mapstructure:",squash"` + + // CollectorName is the name under which collector will be registered. + // Please note that registering a collector under a name which is already + // used is not allowed. + CollectorName string `mapstructure:"collector_name"` + // CollectorEnvironment is the environment which will be used when updating + // the collector metadata. + CollectorEnvironment string `mapstructure:"collector_environment"` + // CollectorDescription is the description which will be used when the + // collector is being registered. + CollectorDescription string `mapstructure:"collector_description"` + // CollectorCategory is the collector category which will be used when the + // collector is being registered. + CollectorCategory string `mapstructure:"collector_category"` + // CollectorFields defines the collector fields. + // For more information on this subject visit: + // https://help.sumologic.com/docs/manage/fields + CollectorFields map[string]any `mapstructure:"collector_fields"` + + // DiscoverCollectorTags enables collector metadata tag auto-discovery. + DiscoverCollectorTags bool `mapstructure:"discover_collector_tags"` + + APIBaseURL string `mapstructure:"api_base_url"` + + HeartBeatInterval time.Duration `mapstructure:"heartbeat_interval"` + + // CollectorCredentialsDirectory is the directory where state files + // with collector credentials will be stored after successful collector + // registration. Default value is $HOME/.sumologic-otel-collector + CollectorCredentialsDirectory string `mapstructure:"collector_credentials_directory"` + + // Clobber defines whether to delete any existing collector with the same + // name and create a new one upon registration. + // By default this is false. + Clobber bool `mapstructure:"clobber"` + + // ForceRegistration defines whether to force registration every time the + // collector starts. + // This will cause the collector to not look at the locally stored credentials + // and to always reach out to API to register itself. + // + // NOTE: if clobber is unset (default) then setting this to true will create + // a new collector on Sumo UI on every collector start. + // + // By default this is false. + ForceRegistration bool `mapstructure:"force_registration"` + + // Ephemeral defines whether the collector will be deleted after 12 hours + // of inactivity. + // By default this is false. + Ephemeral bool `mapstructure:"ephemeral"` + + // TimeZone defines the time zone of the Collector. + // For a list of possible values, refer to the "TZ" column in + // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List. + TimeZone string `mapstructure:"time_zone"` + + // BackOff defines configuration of collector registration backoff algorithm + // Exponential algorithm is being used. + // Please see following link for details: https://github.com/cenkalti/backoff + BackOff backOffConfig `mapstructure:"backoff"` +} + +type accessCredentials struct { + InstallationToken configopaque.String `mapstructure:"installation_token"` +} + +// backOff configuration. See following link for details: +// https://pkg.go.dev/github.com/cenkalti/backoff/v4#ExponentialBackOff +type backOffConfig struct { + InitialInterval time.Duration `mapstructure:"initial_interval"` + MaxInterval time.Duration `mapstructure:"max_interval"` + MaxElapsedTime time.Duration `mapstructure:"max_elapsed_time"` +} diff --git a/extension/sumologicextension/extension.go b/extension/sumologicextension/extension.go new file mode 100644 index 000000000000..b3774da85d2d --- /dev/null +++ b/extension/sumologicextension/extension.go @@ -0,0 +1,33 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sumologicextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" + +import ( + "context" + "time" + + "go.opentelemetry.io/collector/component" + "go.uber.org/zap" +) + +type SumologicExtension struct { +} + +const DefaultHeartbeatInterval = 15 * time.Second + +func init() { +} + +func newSumologicExtension(_ *Config, _ *zap.Logger, _ component.ID, _ string) (*SumologicExtension, error) { + return &SumologicExtension{}, nil +} + +func (se *SumologicExtension) Start(_ context.Context, _ component.Host) error { + return nil +} + +// Shutdown is invoked during service shutdown. +func (se *SumologicExtension) Shutdown(_ context.Context) error { + return nil +} diff --git a/extension/sumologicextension/factory.go b/extension/sumologicextension/factory.go new file mode 100644 index 000000000000..b21f2a064b77 --- /dev/null +++ b/extension/sumologicextension/factory.go @@ -0,0 +1,56 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 +// +//go:generate mdatagen metadata.yaml + +package sumologicextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension" + +import ( + "context" + + "github.com/cenkalti/backoff/v4" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/extension" + + "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension/internal/metadata" +) + +const ( + // The value of extension "type" in configuration. + DefaultAPIBaseURL = "https://open-collectors.sumologic.com" +) + +// NewFactory creates a factory for Sumo Logic extension. +func NewFactory() extension.Factory { + return extension.NewFactory( + metadata.Type, + createDefaultConfig, + createExtension, + metadata.ExtensionStability, + ) +} + +func createDefaultConfig() component.Config { + defaultCredsPath := "" + + return &Config{ + APIBaseURL: DefaultAPIBaseURL, + HeartBeatInterval: DefaultHeartbeatInterval, + CollectorCredentialsDirectory: defaultCredsPath, + Clobber: false, + DiscoverCollectorTags: true, + ForceRegistration: false, + Ephemeral: false, + TimeZone: "", + BackOff: backOffConfig{ + InitialInterval: backoff.DefaultInitialInterval, + MaxInterval: backoff.DefaultMaxInterval, + MaxElapsedTime: backoff.DefaultMaxElapsedTime, + }, + } +} + +func createExtension(_ context.Context, params extension.CreateSettings, cfg component.Config) (extension.Extension, error) { + config := cfg.(*Config) + return newSumologicExtension(config, params.Logger, params.ID, params.BuildInfo.Version) +} diff --git a/extension/sumologicextension/factory_test.go b/extension/sumologicextension/factory_test.go new file mode 100644 index 000000000000..230e310c0a88 --- /dev/null +++ b/extension/sumologicextension/factory_test.go @@ -0,0 +1,62 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package sumologicextension + +import ( + "context" + "testing" + + "github.com/cenkalti/backoff/v4" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension" +) + +func TestFactory_CreateDefaultConfig(t *testing.T) { + cfg := createDefaultConfig() + defaultCredsPath := "" + assert.Equal(t, &Config{ + HeartBeatInterval: DefaultHeartbeatInterval, + APIBaseURL: DefaultAPIBaseURL, + CollectorCredentialsDirectory: defaultCredsPath, + DiscoverCollectorTags: true, + BackOff: backOffConfig{ + InitialInterval: backoff.DefaultInitialInterval, + MaxInterval: backoff.DefaultMaxInterval, + MaxElapsedTime: backoff.DefaultMaxElapsedTime, + }, + }, cfg) + + assert.NoError(t, component.ValidateConfig(cfg)) + + ccfg := cfg.(*Config) + ccfg.CollectorName = "test_collector" + ccfg.Credentials.InstallationToken = "dummy_install_token" + + ext, err := createExtension(context.Background(), + extension.CreateSettings{ + TelemetrySettings: componenttest.NewNopTelemetrySettings(), + }, + cfg, + ) + require.NoError(t, err) + require.NotNil(t, ext) +} + +func TestFactory_CreateExtension(t *testing.T) { + cfg := createDefaultConfig().(*Config) + cfg.CollectorName = "test_collector" + cfg.Credentials.InstallationToken = "dummy_install_token" + + ext, err := createExtension(context.Background(), + extension.CreateSettings{ + TelemetrySettings: componenttest.NewNopTelemetrySettings(), + }, + cfg, + ) + require.NoError(t, err) + require.NotNil(t, ext) +} diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod new file mode 100644 index 000000000000..21a1347005b3 --- /dev/null +++ b/extension/sumologicextension/go.mod @@ -0,0 +1,65 @@ +module github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension + +go 1.20 + +require ( + github.com/cenkalti/backoff/v4 v4.2.1 + github.com/stretchr/testify v1.8.4 + go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/otel/metric v1.22.0 + go.opentelemetry.io/otel/trace v1.22.0 + go.uber.org/zap v1.26.0 +) + +require ( + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/hashicorp/go-version v1.6.0 // indirect + github.com/klauspost/compress v1.17.5 // 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.0.1 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.46.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect + github.com/rs/cors v1.10.1 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect + go.opentelemetry.io/otel/sdk v1.22.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect + golang.org/x/text v0.14.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect + google.golang.org/grpc v1.61.0 // indirect + google.golang.org/protobuf v1.32.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum new file mode 100644 index 000000000000..222b61e753e1 --- /dev/null +++ b/extension/sumologicextension/go.sum @@ -0,0 +1,157 @@ +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.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= +github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +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.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= +github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +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/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= +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-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +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/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= +github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo= +github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= +go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= +go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= +go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= +go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= +go.opentelemetry.io/otel/exporters/prometheus v0.45.0/go.mod h1:UVJZPLnfDSvHj+eJuZE+E1GjIBD267mEMfAAHJdghWg= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= +go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= +go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= +go.opentelemetry.io/otel/sdk/metric v1.22.0 h1:ARrRetm1HCVxq0cbnaZQlfwODYJHo3gFL8Z3tSmHBcI= +go.opentelemetry.io/otel/sdk/metric v1.22.0/go.mod h1:KjQGeMIDlBNEOo6HvjhxIec1p/69/kULDcp4gr0oLQQ= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +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.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +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.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +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.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +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-20240116215550-a9fa1716bcac h1:nUQEQmH/csSvFECKYRv6HWEyypysidKl2I6Qpsglq/0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= +google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/extension/sumologicextension/internal/metadata/generated_status.go b/extension/sumologicextension/internal/metadata/generated_status.go new file mode 100644 index 000000000000..cb9f107e4ad9 --- /dev/null +++ b/extension/sumologicextension/internal/metadata/generated_status.go @@ -0,0 +1,22 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package metadata + +import ( + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/otel/metric" + "go.opentelemetry.io/otel/trace" +) + +const ( + Type = "sumologic" + ExtensionStability = component.StabilityLevelDevelopment +) + +func Meter(settings component.TelemetrySettings) metric.Meter { + return settings.MeterProvider.Meter("otelcol/sumologic") +} + +func Tracer(settings component.TelemetrySettings) trace.Tracer { + return settings.TracerProvider.Tracer("otelcol/sumologic") +} diff --git a/extension/sumologicextension/metadata.yaml b/extension/sumologicextension/metadata.yaml new file mode 100644 index 000000000000..464a9643a751 --- /dev/null +++ b/extension/sumologicextension/metadata.yaml @@ -0,0 +1,9 @@ +type: sumologic + +status: + class: extension + stability: + development: [extension] + distributions: [sumo] + codeowners: + active: [astencel-sumo, sumo-drosiek, swiatekm-sumo] diff --git a/reports/distributions/sumo.yaml b/reports/distributions/sumo.yaml index 7064477973dd..1e24d12af5a4 100644 --- a/reports/distributions/sumo.yaml +++ b/reports/distributions/sumo.yaml @@ -39,6 +39,7 @@ components: - oidc - pprof - sigv4auth + - sumologic processor: - attributes - cumulativetodelta diff --git a/versions.yaml b/versions.yaml index 71d5e1a15d2c..63e267d2e380 100644 --- a/versions.yaml +++ b/versions.yaml @@ -97,6 +97,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage + - github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight From 9e6cd97d04da4ab5baf39e82d9bb36186bcbdd64 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Fri, 2 Feb 2024 15:19:54 +0000 Subject: [PATCH 02/18] [chore][exporter/splunk_hec] Explicit check for component.Type in test (#31015) **Description:** Explicit uses `component.Type` when building string to compare to in test. Remove comment that will soon be outdated about the component.Type. **Link to tracking Issue:** Needed for open-telemetry/opentelemetry-collector/pull/9414 --- exporter/splunkhecexporter/client_test.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 843f6faf3b57..019743d64883 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -1394,8 +1394,10 @@ func TestHeartbeatStartupFailed(t *testing.T) { params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) assert.NoError(t, err) - // The exporter's name is "" while generating default params - assert.EqualError(t, exporter.Start(context.Background(), componenttest.NewNopHost()), ": heartbeat on startup failed: HTTP 403 \"Forbidden\"") + assert.EqualError(t, + exporter.Start(context.Background(), componenttest.NewNopHost()), + fmt.Sprintf("%s: heartbeat on startup failed: HTTP 403 \"Forbidden\"", params.ID.Type()), + ) } func TestHeartbeatStartupPass_Disabled(t *testing.T) { From d02d376f20a67762c85766590249911b77198b8b Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Fri, 2 Feb 2024 07:59:56 -0800 Subject: [PATCH 03/18] [processor/servicegraph] remove deprecated component (#30149) This component was replaced by the servicegraphconnector, which was a wrapper around the servicegraphprocessor. This PR moves the processor code into the connector component and removes the processor altogether. Note that as part of this PR I added the traces_to_traces support as it was supported by the processor before (with the development status). Fixes #30041 Fixes #26091 --------- Signed-off-by: Alex Boten --- .../codeboten_mv-deprecated-component.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 - cmd/configschema/go.mod | 3 - cmd/otelcontribcol/builder-config.yaml | 2 - cmd/otelcontribcol/components.go | 2 - cmd/otelcontribcol/go.mod | 3 - .../servicegraphconnector}/config.go | 2 +- .../servicegraphconnector/config_test.go | 45 +++ .../servicegraphconnector/connector.go | 92 +++-- .../servicegraphconnector/connector_test.go | 328 +---------------- connector/servicegraphconnector/factory.go | 64 +++- .../servicegraphconnector/factory_test.go | 54 ++- connector/servicegraphconnector/go.mod | 60 +++- connector/servicegraphconnector/go.sum | 140 +++++++- .../internal/store/edge.go | 2 +- .../internal/store/package_test.go | 0 .../internal/store/store.go | 2 +- .../internal/store/store_test.go | 2 +- .../service-graph-connector-config.yaml | 0 .../servicegraphconnector}/util.go | 2 +- go.mod | 3 - internal/components/components.go | 2 - processor/servicegraphprocessor/Makefile | 1 - processor/servicegraphprocessor/README.md | 177 --------- .../servicegraphprocessor/config_test.go | 68 ---- processor/servicegraphprocessor/doc.go | 6 - processor/servicegraphprocessor/factory.go | 90 ----- .../servicegraphprocessor/factory_test.go | 100 ------ .../generated_component_test.go | 98 ----- processor/servicegraphprocessor/go.mod | 127 ------- processor/servicegraphprocessor/go.sum | 338 ------------------ .../internal/metadata/generated_status.go | 22 -- processor/servicegraphprocessor/metadata.yaml | 14 - .../testdata/service-graph-config.yaml | 28 -- reports/distributions/contrib.yaml | 1 - reports/distributions/sumo.yaml | 1 - versions.yaml | 1 - 40 files changed, 395 insertions(+), 1516 deletions(-) create mode 100755 .chloggen/codeboten_mv-deprecated-component.yaml rename {processor/servicegraphprocessor => connector/servicegraphconnector}/config.go (94%) create mode 100644 connector/servicegraphconnector/config_test.go rename processor/servicegraphprocessor/processor.go => connector/servicegraphconnector/connector.go (87%) rename processor/servicegraphprocessor/processor_test.go => connector/servicegraphconnector/connector_test.go (52%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/internal/store/edge.go (96%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/internal/store/package_test.go (100%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/internal/store/store.go (97%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/internal/store/store_test.go (96%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/testdata/service-graph-connector-config.yaml (100%) rename {processor/servicegraphprocessor => connector/servicegraphconnector}/util.go (80%) delete mode 100644 processor/servicegraphprocessor/Makefile delete mode 100644 processor/servicegraphprocessor/README.md delete mode 100644 processor/servicegraphprocessor/config_test.go delete mode 100644 processor/servicegraphprocessor/doc.go delete mode 100644 processor/servicegraphprocessor/factory.go delete mode 100644 processor/servicegraphprocessor/factory_test.go delete mode 100644 processor/servicegraphprocessor/generated_component_test.go delete mode 100644 processor/servicegraphprocessor/go.mod delete mode 100644 processor/servicegraphprocessor/go.sum delete mode 100644 processor/servicegraphprocessor/internal/metadata/generated_status.go delete mode 100644 processor/servicegraphprocessor/metadata.yaml delete mode 100644 processor/servicegraphprocessor/testdata/service-graph-config.yaml diff --git a/.chloggen/codeboten_mv-deprecated-component.yaml b/.chloggen/codeboten_mv-deprecated-component.yaml new file mode 100755 index 000000000000..13b2405c63bd --- /dev/null +++ b/.chloggen/codeboten_mv-deprecated-component.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: servicegraphprocessor + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: removed deprecated component, use the servicegraph connector instead. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26091] + +# (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 af10a21eef5b..03676c63560d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -174,7 +174,6 @@ processor/resourcedetectionprocessor/internal/openshift/ @open-telemetry/collect processor/resourceprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy -processor/servicegraphprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno processor/spanmetricsprocessor/ @open-telemetry/collector-contrib-approvers processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 240353d41255..c96309f1a015 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -170,7 +170,6 @@ body: - processor/resourcedetection/internal/openshift - processor/routing - processor/schema - - processor/servicegraph - processor/span - processor/spanmetrics - processor/sumologic diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 53d0f8669bc1..a407a9880351 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -164,7 +164,6 @@ body: - processor/resourcedetection/internal/openshift - processor/routing - processor/schema - - processor/servicegraph - processor/span - processor/spanmetrics - processor/sumologic diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml index 4e12e345b64a..ec95b3a4832f 100644 --- a/.github/ISSUE_TEMPLATE/other.yaml +++ b/.github/ISSUE_TEMPLATE/other.yaml @@ -164,7 +164,6 @@ body: - processor/resourcedetection/internal/openshift - processor/routing - processor/schema - - processor/servicegraph - processor/span - processor/spanmetrics - processor/sumologic diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 569248d75ca8..e004dbdfd865 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -513,7 +513,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.93.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.93.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.93.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureblobreceiver v0.93.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azureeventhubreceiver v0.93.0 // indirect @@ -928,8 +927,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/reso replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor => ../../processor/routingprocessor/ -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor/ - replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor => ../../processor/spanmetricsprocessor/ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor => ../../processor/spanprocessor/ diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index dcbb93e1385a..3f79cf1a0ca5 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -112,7 +112,6 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.93.0 - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.93.0 @@ -283,7 +282,6 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver => ../../receiver/vcenterreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver => ../../receiver/statsdreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter - - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ../../processor/groupbytraceprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter => ../../exporter/tencentcloudlogserviceexporter - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter => ../../exporter/loadbalancingexporter diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go index e76318a39ad3..40f528e3d935 100644 --- a/cmd/otelcontribcol/components.go +++ b/cmd/otelcontribcol/components.go @@ -114,7 +114,6 @@ import ( resourcedetectionprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" resourceprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" routingprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor" - servicegraphprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" spanmetricsprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor" spanprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" sumologicprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor" @@ -415,7 +414,6 @@ func components() (otelcol.Factories, error) { resourcedetectionprocessor.NewFactory(), resourceprocessor.NewFactory(), routingprocessor.NewFactory(), - servicegraphprocessor.NewFactory(), spanmetricsprocessor.NewFactory(), sumologicprocessor.NewFactory(), spanprocessor.NewFactory(), diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 485897d16b08..d5def7f001d8 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -102,7 +102,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.93.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor v0.93.0 @@ -855,8 +854,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/stats replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor - replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor => ../../processor/groupbytraceprocessor replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tencentcloudlogserviceexporter => ../../exporter/tencentcloudlogserviceexporter diff --git a/processor/servicegraphprocessor/config.go b/connector/servicegraphconnector/config.go similarity index 94% rename from processor/servicegraphprocessor/config.go rename to connector/servicegraphconnector/config.go index ab2172bff0c1..316ac0eb2cba 100644 --- a/processor/servicegraphprocessor/config.go +++ b/connector/servicegraphconnector/config.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" +package servicegraphconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" import ( "time" diff --git a/connector/servicegraphconnector/config_test.go b/connector/servicegraphconnector/config_test.go new file mode 100644 index 000000000000..62936dae18d2 --- /dev/null +++ b/connector/servicegraphconnector/config_test.go @@ -0,0 +1,45 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package servicegraphconnector + +import ( + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/otelcol/otelcoltest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/metadata" +) + +func TestLoadConfig(t *testing.T) { + // Prepare + factories, err := otelcoltest.NopFactories() + require.NoError(t, err) + + factories.Connectors[metadata.Type] = NewFactory() + + cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-connector-config.yaml"), factories) + + // Verify + require.NoError(t, err) + require.NotNil(t, cfg) + assert.Equal(t, + &Config{ + LatencyHistogramBuckets: []time.Duration{1, 2, 3, 4, 5}, + Dimensions: []string{"dimension-1", "dimension-2"}, + Store: StoreConfig{ + TTL: time.Second, + MaxItems: 10, + }, + CacheLoop: time.Minute, + StoreExpirationLoop: 2 * time.Second, + }, + cfg.Connectors[component.NewID(metadata.Type)], + ) + +} diff --git a/processor/servicegraphprocessor/processor.go b/connector/servicegraphconnector/connector.go similarity index 87% rename from processor/servicegraphprocessor/processor.go rename to connector/servicegraphconnector/connector.go index 0fde2f0c5ac6..220e3a303f06 100644 --- a/processor/servicegraphprocessor/processor.go +++ b/connector/servicegraphconnector/connector.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" +package servicegraphconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" import ( "context" @@ -24,8 +24,8 @@ import ( "go.opentelemetry.io/otel/metric" "go.uber.org/zap" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/store" + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/metadata" + "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/store" ) const ( @@ -52,13 +52,12 @@ type metricSeries struct { lastUpdated int64 // Used to remove stale series } -var _ processor.Traces = (*serviceGraphProcessor)(nil) +var _ processor.Traces = (*serviceGraphConnector)(nil) -type serviceGraphProcessor struct { +type serviceGraphConnector struct { config *Config logger *zap.Logger metricsConsumer consumer.Metrics - tracesConsumer consumer.Traces store *store.Store @@ -85,7 +84,7 @@ type serviceGraphProcessor struct { shutdownCh chan any } -func newProcessor(set component.TelemetrySettings, config component.Config) *serviceGraphProcessor { +func newConnector(set component.TelemetrySettings, config component.Config) *serviceGraphConnector { pConfig := config.(*Config) bounds := defaultLatencyHistogramBuckets @@ -126,7 +125,7 @@ func newProcessor(set component.TelemetrySettings, config component.Config) *ser metric.WithUnit("1"), ) - return &serviceGraphProcessor{ + return &serviceGraphConnector{ config: pConfig, logger: set.Logger, startTime: time.Now(), @@ -147,7 +146,7 @@ func newProcessor(set component.TelemetrySettings, config component.Config) *ser } } -func (p *serviceGraphProcessor) Start(_ context.Context, host component.Host) error { +func (p *serviceGraphConnector) Start(_ context.Context, host component.Host) error { p.store = store.NewStore(p.config.Store.TTL, p.config.Store.MaxItems, p.onComplete, p.onExpire) if p.metricsConsumer == nil { @@ -174,15 +173,11 @@ func (p *serviceGraphProcessor) Start(_ context.Context, host component.Host) er go p.storeExpirationLoop(p.config.StoreExpirationLoop) - if p.tracesConsumer == nil { - p.logger.Info("Started servicegraphconnector") - } else { - p.logger.Info("Started servicegraphprocessor") - } + p.logger.Info("Started servicegraphconnector") return nil } -func (p *serviceGraphProcessor) metricFlushLoop(flushInterval time.Duration) { +func (p *serviceGraphConnector) metricFlushLoop(flushInterval time.Duration) { if flushInterval <= 0 { return } @@ -202,7 +197,7 @@ func (p *serviceGraphProcessor) metricFlushLoop(flushInterval time.Duration) { } } -func (p *serviceGraphProcessor) flushMetrics(ctx context.Context) error { +func (p *serviceGraphConnector) flushMetrics(ctx context.Context) error { md, err := p.buildMetrics() if err != nil { return fmt.Errorf("failed to build metrics: %w", err) @@ -213,25 +208,21 @@ func (p *serviceGraphProcessor) flushMetrics(ctx context.Context) error { return nil } - // Firstly, export md to avoid being impacted by downstream trace serviceGraphProcessor errors/latency. + // Firstly, export md to avoid being impacted by downstream trace serviceGraphConnector errors/latency. return p.metricsConsumer.ConsumeMetrics(ctx, md) } -func (p *serviceGraphProcessor) Shutdown(_ context.Context) error { - if p.tracesConsumer == nil { - p.logger.Info("Shutting down servicegraphconnector") - } else { - p.logger.Info("Shutting down servicegraphprocessor") - } +func (p *serviceGraphConnector) Shutdown(_ context.Context) error { + p.logger.Info("Shutting down servicegraphconnector") close(p.shutdownCh) return nil } -func (p *serviceGraphProcessor) Capabilities() consumer.Capabilities { +func (p *serviceGraphConnector) Capabilities() consumer.Capabilities { return consumer.Capabilities{MutatesData: false} } -func (p *serviceGraphProcessor) ConsumeTraces(ctx context.Context, td ptrace.Traces) error { +func (p *serviceGraphConnector) ConsumeTraces(ctx context.Context, td ptrace.Traces) error { if err := p.aggregateMetrics(ctx, td); err != nil { return fmt.Errorf("failed to aggregate metrics: %w", err) } @@ -244,13 +235,10 @@ func (p *serviceGraphProcessor) ConsumeTraces(ctx context.Context, td ptrace.Tra } } - if p.tracesConsumer == nil { // True if p is a connector - return nil - } - return p.tracesConsumer.ConsumeTraces(ctx, td) + return nil } -func (p *serviceGraphProcessor) aggregateMetrics(ctx context.Context, td ptrace.Traces) (err error) { +func (p *serviceGraphConnector) aggregateMetrics(ctx context.Context, td ptrace.Traces) (err error) { var ( isNew bool totalDroppedSpans int @@ -344,7 +332,7 @@ func (p *serviceGraphProcessor) aggregateMetrics(ctx context.Context, td ptrace. return nil } -func (p *serviceGraphProcessor) upsertDimensions(kind string, m map[string]string, resourceAttr pcommon.Map, spanAttr pcommon.Map) { +func (p *serviceGraphConnector) upsertDimensions(kind string, m map[string]string, resourceAttr pcommon.Map, spanAttr pcommon.Map) { for _, dim := range p.config.Dimensions { if v, ok := findAttributeValue(dim, resourceAttr, spanAttr); ok { m[kind+"_"+dim] = v @@ -352,7 +340,7 @@ func (p *serviceGraphProcessor) upsertDimensions(kind string, m map[string]strin } } -func (p *serviceGraphProcessor) upsertPeerAttributes(m []string, peers map[string]string, spanAttr pcommon.Map) { +func (p *serviceGraphConnector) upsertPeerAttributes(m []string, peers map[string]string, spanAttr pcommon.Map) { for _, s := range m { if v, ok := findAttributeValue(s, spanAttr); ok { peers[s] = v @@ -361,7 +349,7 @@ func (p *serviceGraphProcessor) upsertPeerAttributes(m []string, peers map[strin } } -func (p *serviceGraphProcessor) onComplete(e *store.Edge) { +func (p *serviceGraphConnector) onComplete(e *store.Edge) { p.logger.Debug( "edge completed", zap.String("client_service", e.ClientService), @@ -372,7 +360,7 @@ func (p *serviceGraphProcessor) onComplete(e *store.Edge) { p.aggregateMetricsForEdge(e) } -func (p *serviceGraphProcessor) onExpire(e *store.Edge) { +func (p *serviceGraphConnector) onExpire(e *store.Edge) { p.logger.Debug( "edge expired", zap.String("client_service", e.ClientService), @@ -397,7 +385,7 @@ func (p *serviceGraphProcessor) onExpire(e *store.Edge) { } } -func (p *serviceGraphProcessor) aggregateMetricsForEdge(e *store.Edge) { +func (p *serviceGraphConnector) aggregateMetricsForEdge(e *store.Edge) { metricKey := p.buildMetricKey(e.ClientService, e.ServerService, string(e.ConnectionType), e.Dimensions) dimensions := buildDimensions(e) @@ -411,7 +399,7 @@ func (p *serviceGraphProcessor) aggregateMetricsForEdge(e *store.Edge) { p.updateDurationMetrics(metricKey, e.ServerLatencySec, e.ClientLatencySec) } -func (p *serviceGraphProcessor) updateSeries(key string, dimensions pcommon.Map) { +func (p *serviceGraphConnector) updateSeries(key string, dimensions pcommon.Map) { p.metricMutex.Lock() defer p.metricMutex.Unlock() // Overwrite the series if it already exists @@ -421,7 +409,7 @@ func (p *serviceGraphProcessor) updateSeries(key string, dimensions pcommon.Map) } } -func (p *serviceGraphProcessor) dimensionsForSeries(key string) (pcommon.Map, bool) { +func (p *serviceGraphConnector) dimensionsForSeries(key string) (pcommon.Map, bool) { p.metricMutex.RLock() defer p.metricMutex.RUnlock() if series, ok := p.keyToMetric[key]; ok { @@ -431,16 +419,16 @@ func (p *serviceGraphProcessor) dimensionsForSeries(key string) (pcommon.Map, bo return pcommon.Map{}, false } -func (p *serviceGraphProcessor) updateCountMetrics(key string) { p.reqTotal[key]++ } +func (p *serviceGraphConnector) updateCountMetrics(key string) { p.reqTotal[key]++ } -func (p *serviceGraphProcessor) updateErrorMetrics(key string) { p.reqFailedTotal[key]++ } +func (p *serviceGraphConnector) updateErrorMetrics(key string) { p.reqFailedTotal[key]++ } -func (p *serviceGraphProcessor) updateDurationMetrics(key string, serverDuration, clientDuration float64) { +func (p *serviceGraphConnector) updateDurationMetrics(key string, serverDuration, clientDuration float64) { p.updateServerDurationMetrics(key, serverDuration) p.updateClientDurationMetrics(key, clientDuration) } -func (p *serviceGraphProcessor) updateServerDurationMetrics(key string, duration float64) { +func (p *serviceGraphConnector) updateServerDurationMetrics(key string, duration float64) { index := sort.SearchFloat64s(p.reqDurationBounds, duration) // Search bucket index if _, ok := p.reqServerDurationSecondsBucketCounts[key]; !ok { p.reqServerDurationSecondsBucketCounts[key] = make([]uint64, len(p.reqDurationBounds)+1) @@ -450,7 +438,7 @@ func (p *serviceGraphProcessor) updateServerDurationMetrics(key string, duration p.reqServerDurationSecondsBucketCounts[key][index]++ } -func (p *serviceGraphProcessor) updateClientDurationMetrics(key string, duration float64) { +func (p *serviceGraphConnector) updateClientDurationMetrics(key string, duration float64) { index := sort.SearchFloat64s(p.reqDurationBounds, duration) // Search bucket index if _, ok := p.reqClientDurationSecondsBucketCounts[key]; !ok { p.reqClientDurationSecondsBucketCounts[key] = make([]uint64, len(p.reqDurationBounds)+1) @@ -472,7 +460,7 @@ func buildDimensions(e *store.Edge) pcommon.Map { return dims } -func (p *serviceGraphProcessor) buildMetrics() (pmetric.Metrics, error) { +func (p *serviceGraphConnector) buildMetrics() (pmetric.Metrics, error) { m := pmetric.NewMetrics() ilm := m.ResourceMetrics().AppendEmpty().ScopeMetrics().AppendEmpty() ilm.Scope().SetName("traces_service_graph") @@ -492,7 +480,7 @@ func (p *serviceGraphProcessor) buildMetrics() (pmetric.Metrics, error) { return m, nil } -func (p *serviceGraphProcessor) collectCountMetrics(ilm pmetric.ScopeMetrics) error { +func (p *serviceGraphConnector) collectCountMetrics(ilm pmetric.ScopeMetrics) error { for key, c := range p.reqTotal { mCount := ilm.Metrics().AppendEmpty() mCount.SetName("traces_service_graph_request_total") @@ -536,7 +524,7 @@ func (p *serviceGraphProcessor) collectCountMetrics(ilm pmetric.ScopeMetrics) er return nil } -func (p *serviceGraphProcessor) collectLatencyMetrics(ilm pmetric.ScopeMetrics) error { +func (p *serviceGraphConnector) collectLatencyMetrics(ilm pmetric.ScopeMetrics) error { // TODO: Remove this once legacy metric names are removed if legacyMetricNamesFeatureGate.IsEnabled() { return p.collectServerLatencyMetrics(ilm, "traces_service_graph_request_duration_seconds") @@ -549,7 +537,7 @@ func (p *serviceGraphProcessor) collectLatencyMetrics(ilm pmetric.ScopeMetrics) return p.collectClientLatencyMetrics(ilm) } -func (p *serviceGraphProcessor) collectClientLatencyMetrics(ilm pmetric.ScopeMetrics) error { +func (p *serviceGraphConnector) collectClientLatencyMetrics(ilm pmetric.ScopeMetrics) error { for key := range p.reqServerDurationSecondsCount { mDuration := ilm.Metrics().AppendEmpty() mDuration.SetName("traces_service_graph_request_client_seconds") @@ -577,7 +565,7 @@ func (p *serviceGraphProcessor) collectClientLatencyMetrics(ilm pmetric.ScopeMet return nil } -func (p *serviceGraphProcessor) collectServerLatencyMetrics(ilm pmetric.ScopeMetrics, mName string) error { +func (p *serviceGraphConnector) collectServerLatencyMetrics(ilm pmetric.ScopeMetrics, mName string) error { for key := range p.reqServerDurationSecondsCount { mDuration := ilm.Metrics().AppendEmpty() mDuration.SetName(mName) @@ -605,7 +593,7 @@ func (p *serviceGraphProcessor) collectServerLatencyMetrics(ilm pmetric.ScopeMet return nil } -func (p *serviceGraphProcessor) buildMetricKey(clientName, serverName, connectionType string, edgeDimensions map[string]string) string { +func (p *serviceGraphConnector) buildMetricKey(clientName, serverName, connectionType string, edgeDimensions map[string]string) string { var metricKey strings.Builder metricKey.WriteString(clientName + metricKeySeparator + serverName + metricKeySeparator + connectionType) @@ -621,7 +609,7 @@ func (p *serviceGraphProcessor) buildMetricKey(clientName, serverName, connectio } // storeExpirationLoop periodically expires old entries from the store. -func (p *serviceGraphProcessor) storeExpirationLoop(d time.Duration) { +func (p *serviceGraphConnector) storeExpirationLoop(d time.Duration) { t := time.NewTicker(d) for { select { @@ -633,7 +621,7 @@ func (p *serviceGraphProcessor) storeExpirationLoop(d time.Duration) { } } -func (p *serviceGraphProcessor) getPeerHost(m []string, peers map[string]string) string { +func (p *serviceGraphConnector) getPeerHost(m []string, peers map[string]string) string { peerStr := "unknown" for _, s := range m { if peer, ok := peers[s]; ok { @@ -645,7 +633,7 @@ func (p *serviceGraphProcessor) getPeerHost(m []string, peers map[string]string) } // cacheLoop periodically cleans the cache -func (p *serviceGraphProcessor) cacheLoop(d time.Duration) { +func (p *serviceGraphConnector) cacheLoop(d time.Duration) { t := time.NewTicker(d) for { select { @@ -659,7 +647,7 @@ func (p *serviceGraphProcessor) cacheLoop(d time.Duration) { } // cleanCache removes series that have not been updated in 15 minutes -func (p *serviceGraphProcessor) cleanCache() { +func (p *serviceGraphConnector) cleanCache() { var staleSeries []string p.metricMutex.RLock() for key, series := range p.keyToMetric { diff --git a/processor/servicegraphprocessor/processor_test.go b/connector/servicegraphconnector/connector_test.go similarity index 52% rename from processor/servicegraphprocessor/processor_test.go rename to connector/servicegraphconnector/connector_test.go index 8057519080fb..eb52d940935c 100644 --- a/processor/servicegraphprocessor/processor_test.go +++ b/connector/servicegraphconnector/connector_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package servicegraphprocessor +package servicegraphconnector import ( "context" @@ -14,19 +14,14 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" - "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter" - "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/otlpexporter" - "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" - "go.opentelemetry.io/collector/processor/processortest" semconv "go.opentelemetry.io/collector/semconv/v1.13.0" sdkmetric "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/metric/metricdata" @@ -34,54 +29,9 @@ import ( "go.uber.org/zap/zaptest" ) -func TestProcessorStart(t *testing.T) { - // Create otlp exporters. - otlpID, mexp, texp := newOTLPExporters(t) - - for _, tc := range []struct { - name string - exporter component.Component - metricsExporter string - wantErrorMsg string - }{ - {"export to active otlp metrics exporter", mexp, "otlp", ""}, - {"unable to find configured exporter in active exporter list", mexp, "prometheus", "failed to find metrics exporter: 'prometheus'; please configure metrics_exporter from one of: [otlp]"}, - {"export to active otlp traces exporter should error", texp, "otlp", "the exporter \"otlp\" isn't a metrics exporter"}, - } { - t.Run(tc.name, func(t *testing.T) { - // Prepare - exporters := map[component.DataType]map[component.ID]component.Component{ - component.DataTypeMetrics: { - otlpID: tc.exporter, - }, - } - - // Create servicegraph processor - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - cfg.MetricsExporter = tc.metricsExporter - - procCreationParams := processortest.NewNopCreateSettings() - traceProcessor, err := factory.CreateTracesProcessor(context.Background(), procCreationParams, cfg, consumertest.NewNop()) - require.NoError(t, err) - - // Test - smp := traceProcessor.(*serviceGraphProcessor) - err = smp.Start(context.Background(), newMockHost(exporters)) - - // Verify - if tc.wantErrorMsg != "" { - assert.Error(t, err) - } else { - assert.NoError(t, err) - } - }) - } -} - func TestConnectorStart(t *testing.T) { // Create servicegraph processor - factory := NewConnectorFactoryFunc("servicegraph", component.StabilityLevelAlpha) + factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) procCreationParams := connectortest.NewNopCreateSettings() @@ -89,25 +39,9 @@ func TestConnectorStart(t *testing.T) { require.NoError(t, err) // Test - smp := traceProcessor.(*serviceGraphProcessor) + smp := traceProcessor.(*serviceGraphConnector) err = smp.Start(context.Background(), componenttest.NewNopHost()) - - // Verify - assert.NoError(t, err) -} - -func TestProcessorShutdown(t *testing.T) { - // Prepare - factory := NewFactory() - cfg := factory.CreateDefaultConfig().(*Config) - - // Test - next := new(consumertest.TracesSink) - set := componenttest.NewNopTelemetrySettings() - set.Logger = zaptest.NewLogger(t) - p := newProcessor(set, cfg) - p.tracesConsumer = next - err := p.Shutdown(context.Background()) + defer require.NoError(t, smp.Shutdown(context.Background())) // Verify assert.NoError(t, err) @@ -115,14 +49,14 @@ func TestProcessorShutdown(t *testing.T) { func TestConnectorShutdown(t *testing.T) { // Prepare - factory := NewConnectorFactoryFunc("servicegraph", component.StabilityLevelAlpha) + factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) // Test next := new(consumertest.MetricsSink) set := componenttest.NewNopTelemetrySettings() set.Logger = zaptest.NewLogger(t) - p := newProcessor(set, cfg) + p := newConnector(set, cfg) p.metricsConsumer = next err := p.Shutdown(context.Background()) @@ -130,138 +64,6 @@ func TestConnectorShutdown(t *testing.T) { assert.NoError(t, err) } -func TestProcessorConsume(t *testing.T) { - for _, tc := range []struct { - name string - cfg *Config - gates []*featuregate.Gate - sampleTraces ptrace.Traces - verifyMetrics func(t *testing.T, md pmetric.Metrics) - }{ - { - name: "traces with client and server span", - cfg: &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - }, - sampleTraces: buildSampleTrace(t, "val"), - verifyMetrics: verifyHappyCaseMetrics, - }, - { - name: "incomplete traces with virtual server span", - cfg: &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - }, - gates: []*featuregate.Gate{virtualNodeFeatureGate}, - sampleTraces: incompleteClientTraces(), - verifyMetrics: func(t *testing.T, md pmetric.Metrics) { - v, ok := md.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).Attributes().Get("server") - assert.True(t, ok) - assert.Equal(t, "127.10.10.1", v.Str()) - }, - }, - { - name: "incomplete traces with virtual client span", - cfg: &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - }, - gates: []*featuregate.Gate{virtualNodeFeatureGate}, - sampleTraces: incompleteServerTraces(false), - verifyMetrics: func(t *testing.T, md pmetric.Metrics) { - v, ok := md.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().At(0).Sum().DataPoints().At(0).Attributes().Get("client") - assert.True(t, ok) - assert.Equal(t, "user", v.Str()) - }, - }, - { - name: "incomplete traces with client span lost", - cfg: &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - }, - gates: []*featuregate.Gate{virtualNodeFeatureGate}, - sampleTraces: incompleteServerTraces(true), - verifyMetrics: func(t *testing.T, md pmetric.Metrics) { - assert.Equal(t, 0, md.MetricCount()) - }, - }, - { - name: "complete traces with legacy latency metrics", - cfg: &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - }, sampleTraces: buildSampleTrace(t, "val"), - gates: []*featuregate.Gate{virtualNodeFeatureGate, legacyLatencyUnitMsFeatureGate}, - verifyMetrics: verifyHappyCaseMetricsWithDuration(1000), - }, - } { - t.Run(tc.name, func(t *testing.T) { - // Set feature gates - for _, gate := range tc.gates { - require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), true)) - } - - // Prepare - set := componenttest.NewNopTelemetrySettings() - set.Logger = zaptest.NewLogger(t) - p := newProcessor(set, tc.cfg) - p.tracesConsumer = consumertest.NewNop() - - metricsExporter := newMockMetricsExporter() - - mHost := newMockHost(map[component.DataType]map[component.ID]component.Component{ - component.DataTypeMetrics: { - component.NewID("mock"): metricsExporter, - }, - }) - - // Start processor - assert.NoError(t, p.Start(context.Background(), mHost)) - - // Test & verify - // The assertion is part of verifyHappyCaseMetrics func. - assert.NoError(t, p.ConsumeTraces(context.Background(), tc.sampleTraces)) - time.Sleep(time.Second * 2) - - // Force collection - p.store.Expire() - md, err := p.buildMetrics() - assert.NoError(t, err) - tc.verifyMetrics(t, md) - - // Shutdown the processor - assert.NoError(t, p.Shutdown(context.Background())) - - // Unset feature gates - for _, gate := range tc.gates { - require.NoError(t, featuregate.GlobalRegistry().Set(gate.ID(), false)) - } - }) - } -} - func TestConnectorConsume(t *testing.T) { // Prepare cfg := &Config{ @@ -271,7 +73,7 @@ func TestConnectorConsume(t *testing.T) { set := componenttest.NewNopTelemetrySettings() set.Logger = zaptest.NewLogger(t) - conn := newProcessor(set, cfg) + conn := newConnector(set, cfg) conn.metricsConsumer = newMockMetricsExporter() assert.NoError(t, conn.Start(context.Background(), componenttest.NewNopHost())) @@ -291,45 +93,6 @@ func TestConnectorConsume(t *testing.T) { assert.NoError(t, conn.Shutdown(context.Background())) } -func TestProcessor_MetricsFlushInterval(t *testing.T) { - // Prepare - set := componenttest.NewNopTelemetrySettings() - set.Logger = zaptest.NewLogger(t) - p := newProcessor(set, &Config{ - MetricsExporter: "mock", - Dimensions: []string{"some-attribute", "non-existing-attribute"}, - Store: StoreConfig{ - MaxItems: 10, - TTL: time.Nanosecond, - }, - MetricsFlushInterval: 2 * time.Second, - }) - p.tracesConsumer = consumertest.NewNop() - - metricsExporter := newMockMetricsExporter() - mHost := newMockHost(map[component.DataType]map[component.ID]component.Component{ - component.DataTypeMetrics: { - component.NewID("mock"): metricsExporter, - }, - }) - - // Start processor - assert.NoError(t, p.Start(context.Background(), mHost)) - - // Push traces - assert.NoError(t, p.ConsumeTraces(context.Background(), buildSampleTrace(t, "val"))) - - // Metrics are not immediately flushed - assert.Len(t, metricsExporter.getMetrics(), 0) - - // Metrics are flushed after 2 seconds - assert.Eventuallyf(t, func() bool { return len(metricsExporter.getMetrics()) == 1 }, 5*time.Second, 100*time.Millisecond, "metrics are not flushed") - verifyHappyCaseMetrics(t, metricsExporter.getMetrics()[0]) - - // Shutdown the processor - assert.NoError(t, p.Shutdown(context.Background())) -} - func verifyHappyCaseMetrics(t *testing.T, md pmetric.Metrics) { verifyHappyCaseMetricsWithDuration(1)(t, md) } @@ -448,69 +211,6 @@ func buildSampleTrace(t *testing.T, attrValue string) ptrace.Traces { return traces } -func incompleteClientTraces() ptrace.Traces { - tStart := time.Date(2022, 1, 2, 3, 4, 5, 6, time.UTC) - tEnd := time.Date(2022, 1, 2, 3, 4, 6, 6, time.UTC) - - traces := ptrace.NewTraces() - - resourceSpans := traces.ResourceSpans().AppendEmpty() - resourceSpans.Resource().Attributes().PutStr(semconv.AttributeServiceName, "some-client-service") - - scopeSpans := resourceSpans.ScopeSpans().AppendEmpty() - anotherTraceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16}) - anotherClientSpanID := pcommon.SpanID([8]byte{1, 2, 3, 4, 4, 3, 2, 1}) - clientSpanNoServerSpan := scopeSpans.Spans().AppendEmpty() - clientSpanNoServerSpan.SetName("client span") - clientSpanNoServerSpan.SetSpanID(anotherClientSpanID) - clientSpanNoServerSpan.SetTraceID(anotherTraceID) - clientSpanNoServerSpan.SetKind(ptrace.SpanKindClient) - clientSpanNoServerSpan.SetStartTimestamp(pcommon.NewTimestampFromTime(tStart)) - clientSpanNoServerSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(tEnd)) - clientSpanNoServerSpan.Attributes().PutStr(semconv.AttributeNetSockPeerAddr, "127.10.10.1") // Attribute selected as dimension for metrics - - return traces -} - -func incompleteServerTraces(withParentSpan bool) ptrace.Traces { - tStart := time.Date(2022, 1, 2, 3, 4, 5, 6, time.UTC) - tEnd := time.Date(2022, 1, 2, 3, 4, 6, 6, time.UTC) - - traces := ptrace.NewTraces() - - resourceSpans := traces.ResourceSpans().AppendEmpty() - resourceSpans.Resource().Attributes().PutStr(semconv.AttributeServiceName, "some-server-service") - scopeSpans := resourceSpans.ScopeSpans().AppendEmpty() - anotherTraceID := pcommon.TraceID([16]byte{1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 6, 5, 4, 3, 2, 1}) - serverSpanNoClientSpan := scopeSpans.Spans().AppendEmpty() - serverSpanNoClientSpan.SetName("server span") - serverSpanNoClientSpan.SetSpanID([8]byte{0x19, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26}) - if withParentSpan { - serverSpanNoClientSpan.SetParentSpanID([8]byte{0x27, 0x28, 0x29, 0x30, 0x31, 0x32, 0x33, 0x34}) - } - serverSpanNoClientSpan.SetTraceID(anotherTraceID) - serverSpanNoClientSpan.SetKind(ptrace.SpanKindServer) - serverSpanNoClientSpan.SetStartTimestamp(pcommon.NewTimestampFromTime(tStart)) - serverSpanNoClientSpan.SetEndTimestamp(pcommon.NewTimestampFromTime(tEnd)) - return traces -} - -func newOTLPExporters(t *testing.T) (component.ID, exporter.Metrics, exporter.Traces) { - otlpExpFactory := otlpexporter.NewFactory() - otlpID := component.NewID("otlp") - otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ - Endpoint: "example.com:1234", - }, - } - expCreationParams := exportertest.NewNopCreateSettings() - mexp, err := otlpExpFactory.CreateMetricsExporter(context.Background(), expCreationParams, otlpConfig) - require.NoError(t, err) - texp, err := otlpExpFactory.CreateTracesExporter(context.Background(), expCreationParams, otlpConfig) - require.NoError(t, err) - return otlpID, mexp, texp -} - type mockHost struct { component.Host exps map[component.DataType]map[component.ID]component.Component @@ -551,14 +251,8 @@ func (m *mockMetricsExporter) ConsumeMetrics(_ context.Context, md pmetric.Metri return nil } -func (m *mockMetricsExporter) getMetrics() []pmetric.Metrics { - m.mtx.Lock() - defer m.mtx.Unlock() - return m.md -} - func TestUpdateDurationMetrics(t *testing.T) { - p := serviceGraphProcessor{ + p := serviceGraphConnector{ reqTotal: make(map[string]int64), reqFailedTotal: make(map[string]int64), reqServerDurationSecondsSum: make(map[string]float64), @@ -615,8 +309,7 @@ func TestStaleSeriesCleanup(t *testing.T) { set := componenttest.NewNopTelemetrySettings() set.Logger = zaptest.NewLogger(t) - p := newProcessor(set, cfg) - p.tracesConsumer = consumertest.NewNop() + p := newConnector(set, cfg) mHost := newMockHost(map[component.DataType]map[component.ID]component.Component{ component.DataTypeMetrics: { @@ -668,8 +361,7 @@ func TestValidateOwnTelemetry(t *testing.T) { reader := sdkmetric.NewManualReader() set := setupTelemetry(reader) - p := newProcessor(set, cfg) - p.tracesConsumer = consumertest.NewNop() + p := newConnector(set, cfg) mHost := newMockHost(map[component.DataType]map[component.ID]component.Component{ component.DataTypeMetrics: { diff --git a/connector/servicegraphconnector/factory.go b/connector/servicegraphconnector/factory.go index 1e8f3ff8a87e..4b720af11ba6 100644 --- a/connector/servicegraphconnector/factory.go +++ b/connector/servicegraphconnector/factory.go @@ -6,13 +6,73 @@ package servicegraphconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" import ( + "context" + "time" + + "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/connector" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/featuregate" "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/metadata" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" ) +const ( + // The value of "type" key in configuration. + typeStr = "servicegraph" + // The stability level of the processor. + connectorStability = component.StabilityLevelDevelopment + virtualNodeFeatureGateID = "connector.servicegraph.virtualNode" + legacyLatencyMetricNamesFeatureGateID = "connector.servicegraph.legacyLatencyMetricNames" + legacyLatencyUnitMs = "connector.servicegraph.legacyLatencyUnitMs" +) + +var virtualNodeFeatureGate, legacyMetricNamesFeatureGate, legacyLatencyUnitMsFeatureGate *featuregate.Gate + +func init() { + virtualNodeFeatureGate = featuregate.GlobalRegistry().MustRegister( + virtualNodeFeatureGateID, + featuregate.StageAlpha, + featuregate.WithRegisterDescription("When enabled, when the edge expires, processor checks if it has peer attributes(`db.name, net.sock.peer.addr, net.peer.name, rpc.service, http.url, http.target`), and then aggregate the metrics with virtual node."), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/17196"), + ) + // TODO: Remove this feature gate when the legacy metric names are removed. + legacyMetricNamesFeatureGate = featuregate.GlobalRegistry().MustRegister( + legacyLatencyMetricNamesFeatureGateID, + featuregate.StageAlpha, // Alpha because we want it disabled by default. + featuregate.WithRegisterDescription("When enabled, processor uses legacy latency metric names."), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/18743,https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16578"), + ) + legacyLatencyUnitMsFeatureGate = featuregate.GlobalRegistry().MustRegister( + legacyLatencyUnitMs, + featuregate.StageAlpha, // Alpha because we want it disabled by default. + featuregate.WithRegisterDescription("When enabled, processor reports latency in milliseconds, instead of seconds."), + featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27488"), + ) +} + // NewFactory returns a ConnectorFactory. func NewFactory() connector.Factory { - return servicegraphprocessor.NewConnectorFactoryFunc(metadata.Type, metadata.TracesToMetricsStability) + return connector.NewFactory( + typeStr, + createDefaultConfig, + connector.WithTracesToMetrics(createTracesToMetricsConnector, metadata.TracesToMetricsStability), + ) +} + +func createDefaultConfig() component.Config { + return &Config{ + Store: StoreConfig{ + TTL: 2 * time.Second, + MaxItems: 1000, + }, + CacheLoop: time.Minute, + StoreExpirationLoop: 2 * time.Second, + } +} + +func createTracesToMetricsConnector(_ context.Context, params connector.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (connector.Traces, error) { + c := newConnector(params.TelemetrySettings, cfg) + c.metricsConsumer = nextConsumer + return c, nil } diff --git a/connector/servicegraphconnector/factory_test.go b/connector/servicegraphconnector/factory_test.go index 44e83a7aa555..f8dd64bd766d 100644 --- a/connector/servicegraphconnector/factory_test.go +++ b/connector/servicegraphconnector/factory_test.go @@ -6,23 +6,51 @@ package servicegraphconnector // import "github.com/open-telemetry/opentelemetry import ( "context" "testing" + "time" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/connector/connectortest" "go.opentelemetry.io/collector/consumer/consumertest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" ) -func TestNewFactory(t *testing.T) { - factory := NewFactory() - conn, err := factory.CreateTracesToMetrics( - context.Background(), - connectortest.NewNopCreateSettings(), - &servicegraphprocessor.Config{}, - consumertest.NewNop(), - ) - - assert.NoError(t, err) - assert.NotNil(t, conn) +func TestNewConnector(t *testing.T) { + for _, tc := range []struct { + name string + latencyHistogramBuckets []time.Duration + expectedLatencyHistogramBuckets []float64 + }{ + { + name: "simplest config (use defaults)", + expectedLatencyHistogramBuckets: defaultLatencyHistogramBuckets, + }, + { + name: "latency histogram configured with catch-all bucket to check no additional catch-all bucket inserted", + latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, + expectedLatencyHistogramBuckets: []float64{0.002}, + }, + { + name: "full config with no catch-all bucket and check the catch-all bucket is inserted", + latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, + expectedLatencyHistogramBuckets: []float64{0.002}, + }, + } { + t.Run(tc.name, func(t *testing.T) { + // Prepare + factory := NewFactory() + + creationParams := connectortest.NewNopCreateSettings() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.LatencyHistogramBuckets = tc.latencyHistogramBuckets + + // Test + conn, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, consumertest.NewNop()) + smc := conn.(*serviceGraphConnector) + + // Verify + assert.NoError(t, err) + assert.NotNil(t, smc) + + assert.Equal(t, tc.expectedLatencyHistogramBuckets, smc.reqDurationBounds) + }) + } } diff --git a/connector/servicegraphconnector/go.mod b/connector/servicegraphconnector/go.mod index b4e4d0cfd3d4..779720c674b3 100644 --- a/connector/servicegraphconnector/go.mod +++ b/connector/servicegraphconnector/go.mod @@ -3,56 +3,88 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/connector/servi go 1.18 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f go.opentelemetry.io/otel/metric v1.22.0 + go.opentelemetry.io/otel/sdk/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 + go.uber.org/zap v1.26.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.3 // indirect + github.com/google/uuid v1.5.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect + github.com/inconshreveable/mousetrap v1.1.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.0.1 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // 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/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect + github.com/shirou/gopsutil/v3 v3.23.12 // indirect + github.com/shoenig/go-m1cpu v0.1.6 // indirect + github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/tklauser/go-sysconf v0.3.12 // indirect + github.com/tklauser/numcpus v0.6.1 // indirect + github.com/yusufpapurcu/wmi v1.2.3 // indirect + go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/contrib/config v0.2.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/bridge/opencensus v0.45.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect + go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.26.0 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + gonum.org/v1/gonum v0.14.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // indirect @@ -64,13 +96,3 @@ retract ( v0.76.1 v0.65.0 ) - -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ../../processor/servicegraphprocessor/ - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index 5851d9d6064a..97ce507e9996 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -1,38 +1,73 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 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.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/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/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= 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/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/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-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/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.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= +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.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= +github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8kKbZwNZBNPuTTje8U= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= 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/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= 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= @@ -42,6 +77,7 @@ github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLN github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= 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/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= @@ -53,47 +89,58 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= +github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= 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/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= +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/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.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= +github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= +go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= +go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= +go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= @@ -102,35 +149,48 @@ go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1: go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= +go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= +go.opentelemetry.io/contrib/propagators/b3 v1.22.0/go.mod h1:N3z0ycFRhsVZ+tG/uavMxHvOvFE95QM6gwW1zSqT9dQ= +go.opentelemetry.io/contrib/zpages v0.47.0 h1:ekpdNa2wqOvAfwZIGDIIV02zmR+z08aWPt21KrPJnaU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/bridge/opencensus v0.45.0 h1:kEOlv9Exuv3J8GCf1nLMHfrTPGnZOuIkN8YlRM14TtQ= +go.opentelemetry.io/otel/bridge/opencensus v0.45.0/go.mod h1:tkVMJeFOr43+zzwbxtIWsNcCCDT7rI5/c9rhMfMIENg= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0/go.mod h1:AKFZIEPOnqB00P63bTjOiah4ZTaRzl1TKwUWpZdYUHI= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 h1:+RbSCde0ERway5FwKvXR3aRJIFeDu9rtwC6E7BC6uoM= +go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0/go.mod h1:zcI8u2EJxbLPyoZ3SkVAAcQPgYb1TDRzW93xLFnsggU= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 h1:H2JFgRcGiyHg7H7bwcwaQJYrNFqCqrbTQ8K4p1OvDu8= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0/go.mod h1:WfCWp1bGoYK8MeULtI15MmQVczfR+bFkk0DF3h06QmQ= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= go.opentelemetry.io/otel/exporters/prometheus v0.45.0/go.mod h1:UVJZPLnfDSvHj+eJuZE+E1GjIBD267mEMfAAHJdghWg= go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 h1:NjN6zc7Mwy9torqa3mo+pMJ3mHoPI0uzVSYcqB2t72A= +go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0/go.mod h1:U+T5v2bk4fCC8XdSEWZja3Pm/ZhvV/zE7JwX/ELJKts= go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 h1:zr8ymM5OWWjjiWRzwTfZ67c905+2TMHYp2lMJ52QTyM= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0/go.mod h1:sQs7FT2iLVJ+67vYngGJkPe1qr39IzaBzaj9IDNNY8k= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= @@ -140,6 +200,7 @@ go.opentelemetry.io/otel/sdk/metric v1.22.0/go.mod h1:KjQGeMIDlBNEOo6HvjhxIec1p/ go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= +go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= 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= @@ -149,20 +210,39 @@ go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= 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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/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-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-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.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +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.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -170,6 +250,10 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-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= @@ -178,17 +262,41 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T 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= gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= +gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= +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-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= +google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= +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= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +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.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/processor/servicegraphprocessor/internal/store/edge.go b/connector/servicegraphconnector/internal/store/edge.go similarity index 96% rename from processor/servicegraphprocessor/internal/store/edge.go rename to connector/servicegraphconnector/internal/store/edge.go index a1cd307e0133..456a9b6d1f72 100644 --- a/processor/servicegraphprocessor/internal/store/edge.go +++ b/connector/servicegraphconnector/internal/store/edge.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package store // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/store" +package store // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/store" import ( "time" diff --git a/processor/servicegraphprocessor/internal/store/package_test.go b/connector/servicegraphconnector/internal/store/package_test.go similarity index 100% rename from processor/servicegraphprocessor/internal/store/package_test.go rename to connector/servicegraphconnector/internal/store/package_test.go diff --git a/processor/servicegraphprocessor/internal/store/store.go b/connector/servicegraphconnector/internal/store/store.go similarity index 97% rename from processor/servicegraphprocessor/internal/store/store.go rename to connector/servicegraphconnector/internal/store/store.go index 028116428b31..c2c4fee7a389 100644 --- a/processor/servicegraphprocessor/internal/store/store.go +++ b/connector/servicegraphconnector/internal/store/store.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package store // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/store" +package store // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector/internal/store" import ( "container/list" diff --git a/processor/servicegraphprocessor/internal/store/store_test.go b/connector/servicegraphconnector/internal/store/store_test.go similarity index 96% rename from processor/servicegraphprocessor/internal/store/store_test.go rename to connector/servicegraphconnector/internal/store/store_test.go index aae86b500486..df9f9acec943 100644 --- a/processor/servicegraphprocessor/internal/store/store_test.go +++ b/connector/servicegraphconnector/internal/store/store_test.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package store // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/store" +package store import ( "encoding/hex" diff --git a/processor/servicegraphprocessor/testdata/service-graph-connector-config.yaml b/connector/servicegraphconnector/testdata/service-graph-connector-config.yaml similarity index 100% rename from processor/servicegraphprocessor/testdata/service-graph-connector-config.yaml rename to connector/servicegraphconnector/testdata/service-graph-connector-config.yaml diff --git a/processor/servicegraphprocessor/util.go b/connector/servicegraphconnector/util.go similarity index 80% rename from processor/servicegraphprocessor/util.go rename to connector/servicegraphconnector/util.go index b7f39899a732..fc447e9546de 100644 --- a/processor/servicegraphprocessor/util.go +++ b/connector/servicegraphconnector/util.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" +package servicegraphconnector // import "github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector" import ( "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/go.mod b/go.mod index d59e68002fcc..37084d15cfcf 100644 --- a/go.mod +++ b/go.mod @@ -81,7 +81,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.93.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 @@ -928,8 +927,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/reso replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor => ./processor/routingprocessor/ -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor => ./processor/servicegraphprocessor/ - replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor => ./processor/spanmetricsprocessor/ replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor => ./processor/spanprocessor/ diff --git a/internal/components/components.go b/internal/components/components.go index 7ef8ab67785a..31c9fb87e897 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -100,7 +100,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor" "github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor" @@ -380,7 +379,6 @@ func Components() (otelcol.Factories, error) { resourceprocessor.NewFactory(), routingprocessor.NewFactory(), tailsamplingprocessor.NewFactory(), - servicegraphprocessor.NewFactory(), spanmetricsprocessor.NewFactory(), spanprocessor.NewFactory(), cumulativetodeltaprocessor.NewFactory(), diff --git a/processor/servicegraphprocessor/Makefile b/processor/servicegraphprocessor/Makefile deleted file mode 100644 index c1496226e590..000000000000 --- a/processor/servicegraphprocessor/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../Makefile.Common \ No newline at end of file diff --git a/processor/servicegraphprocessor/README.md b/processor/servicegraphprocessor/README.md deleted file mode 100644 index b20ec13260f1..000000000000 --- a/processor/servicegraphprocessor/README.md +++ /dev/null @@ -1,177 +0,0 @@ -# Service graph processor - - -| Status | | -| ------------- |-----------| -| Stability | [deprecated]: traces | -| Distributions | [contrib], [sumo] | -| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Fservicegraph%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aprocessor%2Fservicegraph) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Fservicegraph%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aprocessor%2Fservicegraph) | -| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@mapno](https://www.github.com/mapno) | - -[deprecated]: https://github.com/open-telemetry/opentelemetry-collector#deprecated -[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib -[sumo]: https://github.com/SumoLogic/sumologic-otel-collector - - -The service graph processor is deprecated and will be removed in future versions. Use the [service graph connector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/connector/servicegraphconnector/README.md) instead. - -The service graphs processor is a traces processor that builds a map representing the interrelationships between various services in a system. -The processor will analyse trace data and generate metrics describing the relationship between the services. -These metrics can be used by data visualization apps (e.g. Grafana) to draw a service graph. - -Service graphs are useful for a number of use-cases: - -* Infer the topology of a distributed system. As distributed systems grow, they become more complex. Service graphs can help you understand the structure of the system. -* Provide a high level overview of the health of your system. -Service graphs show error rates, latencies, among other relevant data. -* Provide an historic view of a system’s topology. -Distributed systems change very frequently, -and service graphs offer a way of seeing how these systems have evolved over time. - -This component is based on [Grafana Tempo's service graph processor](https://github.com/grafana/tempo/tree/main/modules/generator/processor/servicegraphs). - -## How it works - -Service graphs work by inspecting traces and looking for spans with parent-children relationship that represent a request. -The processor uses the OpenTelemetry semantic conventions to detect a myriad of requests. -It currently supports the following requests: - -* A direct request between two services where the outgoing and the incoming span must have `span.kind` client and server respectively. -* A request across a messaging system where the outgoing and the incoming span must have `span.kind` producer and consumer respectively. -* A database request; in this case the processor looks for spans containing attributes `span.kind`=client as well as db.name. - -Every span that can be paired up to form a request is kept in an in-memory store, -until its corresponding pair span is received or the maximum waiting time has passed. -When either of these conditions are reached, the request is recorded and removed from the local store. - -Each emitted metrics series have the client and server label corresponding with the service doing the request and the service receiving the request. - -``` -traces_service_graph_request_total{client="app", server="db", connection_type="database"} 20 -``` - -TLDR: The processor will try to find spans belonging to requests as seen from the client and the server and will create a metric representing an edge in the graph. - -## Metrics - -The following metrics are emitted by the processor: - -| Metric | Type | Labels | Description | -|---------------------------------------------|-----------|---------------------------------|--------------------------------------------------------------| -| traces_service_graph_request_total | Counter | client, server, connection_type | Total count of requests between two nodes | -| traces_service_graph_request_failed_total | Counter | client, server, connection_type | Total count of failed requests between two nodes | -| traces_service_graph_request_server_seconds | Histogram | client, server, connection_type | Time for a request between two nodes as seen from the server | -| traces_service_graph_request_client_seconds | Histogram | client, server, connection_type | Time for a request between two nodes as seen from the client | -| traces_service_graph_unpaired_spans_total | Counter | client, server, connection_type | Total count of unpaired spans | -| traces_service_graph_dropped_spans_total | Counter | client, server, connection_type | Total count of dropped spans | - -Duration is measured both from the client and the server sides. - -Possible values for `connection_type`: unset, `messaging_system`, or `database`. - -Additional labels can be included using the `dimensions` configuration option. Those labels will have a prefix to mark where they originate (client or server span kinds). -The `client_` prefix relates to the dimensions coming from spans with `SPAN_KIND_CLIENT`, and the `server_` prefix relates to the -dimensions coming from spans with `SPAN_KIND_SERVER`. - -Since the service graph processor has to process both sides of an edge, -it needs to process all spans of a trace to function properly. -If spans of a trace are spread out over multiple instances, spans are not paired up reliably. -A possible solution to this problem is using the [load balancing exporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/loadbalancingexporter) -in a layer on front of collector instances running this processor. - -## Visualization - -Service graph metrics are natively supported by Grafana since v9.0.4. -To run it, configure a Tempo data source's 'Service Graphs' by linking to the Prometheus backend where metrics are being sent: - -```yaml -apiVersion: 1 -datasources: - # Prometheus backend where metrics are sent - - name: Prometheus - type: prometheus - uid: prometheus - url: - jsonData: - httpMethod: GET - version: 1 - - name: Tempo - type: tempo - uid: tempo - url: - jsonData: - httpMethod: GET - serviceMap: - datasourceUid: 'prometheus' - version: 1 -``` - -## Configuration - -The following settings are required: - -- `metrics_exporter`: the name of the exporter that this processor will write metrics to. This exporter **must** be present in a pipeline. -- `latency_histogram_buckets`: the list of durations defining the latency histogram buckets. - - Default: `[2ms, 4ms, 6ms, 8ms, 10ms, 50ms, 100ms, 200ms, 400ms, 800ms, 1s, 1400ms, 2s, 5s, 10s, 15s]` -- `dimensions`: the list of dimensions to add together with the default dimensions defined above. - -The following settings can be optionally configured: - -- `store`: defines the config for the in-memory store used to find requests between services by pairing spans. - - `ttl`: TTL is the time to live for items in the store. - - Default: `2s` - - `max_items`: MaxItems is the maximum number of items to keep in the store. - - Default: `1000` -- `cache_loop`: the interval at which to clean the cache. -- `store_expiration_loop`: the time to expire old entries from the store periodically. -- `virtual_node_peer_attributes`: the list of attributes need to match for building virtual server node, the higher the front, the higher the priority. - - Default: `[db.name, net.sock.peer.addr, net.peer.name, rpc.service, net.sock.peer.name, net.peer.name, http.url, http.target]` -- `metrics_flush_interval`: the interval at which metrics are flushed to the exporter. Metrics are flush on every received batch of traces by default. - -## Example configuration - -```yaml -receivers: - otlp: - protocols: - grpc: - otlp/servicegraph: # Dummy receiver for the metrics pipeline - protocols: - grpc: - endpoint: localhost:12345 - -processors: - servicegraph: - metrics_exporter: prometheus/servicegraph # Exporter to send metrics to - latency_histogram_buckets: [100us, 1ms, 2ms, 6ms, 10ms, 100ms, 250ms] # Buckets for latency histogram - dimensions: [cluster, namespace] # Additional dimensions (labels) to be added to the metrics extracted from the resource and span attributes - store: # Configuration for the in-memory store - ttl: 2s # Value to wait for an edge to be completed - max_items: 200 # Amount of edges that will be stored in the storeMap - cache_loop: 2m # the time to cleans the cache periodically - store_expiration_loop: 10s # the time to expire old entries from the store periodically. - virtual_node_peer_attributes: - - db.name - - rpc.service -exporters: - prometheus/servicegraph: - endpoint: localhost:9090 - namespace: servicegraph - otlp: - endpoint: localhost:4317 - -service: - pipelines: - traces: - receivers: [otlp] - processors: [servicegraph] - exporters: [otlp] - metrics/servicegraph: - receivers: [otlp/servicegraph] - processors: [] - exporters: [prometheus/servicegraph] -``` - -## Features and Feature-Gates - -See the [Collector feature gates](https://github.com/open-telemetry/opentelemetry-collector/blob/main/featuregate/README.md#collector-feature-gates) for an overview of feature gates in the collector. diff --git a/processor/servicegraphprocessor/config_test.go b/processor/servicegraphprocessor/config_test.go deleted file mode 100644 index ee4cac1c7888..000000000000 --- a/processor/servicegraphprocessor/config_test.go +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package servicegraphprocessor - -import ( - "path/filepath" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/otelcol/otelcoltest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor/internal/metadata" -) - -func TestLoadConfig(t *testing.T) { - // Prepare - factories, err := otelcoltest.NopFactories() - require.NoError(t, err) - - factories.Processors[metadata.Type] = NewFactory() - factories.Connectors[metadata.Type] = NewConnectorFactoryFunc("servicegraph", component.StabilityLevelAlpha) - - // Test - cfg, err := otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-config.yaml"), factories) - - // Verify - require.NoError(t, err) - require.NotNil(t, cfg) - assert.Equal(t, - &Config{ - MetricsExporter: "metrics", - LatencyHistogramBuckets: []time.Duration{1, 2, 3, 4, 5}, - Dimensions: []string{"dimension-1", "dimension-2"}, - Store: StoreConfig{ - TTL: time.Second, - MaxItems: 10, - }, - CacheLoop: 2 * time.Minute, - StoreExpirationLoop: 10 * time.Second, - VirtualNodePeerAttributes: []string{"db.name", "rpc.service"}, - }, - cfg.Processors[component.NewID(metadata.Type)], - ) - - cfg, err = otelcoltest.LoadConfigAndValidate(filepath.Join("testdata", "service-graph-connector-config.yaml"), factories) - - // Verify - require.NoError(t, err) - require.NotNil(t, cfg) - assert.Equal(t, - &Config{ - LatencyHistogramBuckets: []time.Duration{1, 2, 3, 4, 5}, - Dimensions: []string{"dimension-1", "dimension-2"}, - Store: StoreConfig{ - TTL: time.Second, - MaxItems: 10, - }, - CacheLoop: time.Minute, - StoreExpirationLoop: 2 * time.Second, - }, - cfg.Connectors[component.NewID(metadata.Type)], - ) - -} diff --git a/processor/servicegraphprocessor/doc.go b/processor/servicegraphprocessor/doc.go deleted file mode 100644 index 86e86a92fa57..000000000000 --- a/processor/servicegraphprocessor/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -//go:generate mdatagen metadata.yaml - -package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" diff --git a/processor/servicegraphprocessor/factory.go b/processor/servicegraphprocessor/factory.go deleted file mode 100644 index fb046d4baf9a..000000000000 --- a/processor/servicegraphprocessor/factory.go +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package servicegraphprocessor // import "github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor" - -import ( - "context" - "time" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/connector" - "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/featuregate" - "go.opentelemetry.io/collector/processor" -) - -const ( - // The value of "type" key in configuration. - typeStr = "servicegraph" - // The stability level of the processor. - connectorStability = component.StabilityLevelDevelopment - virtualNodeFeatureGateID = "processor.servicegraph.virtualNode" - legacyLatencyMetricNamesFeatureGateID = "processor.servicegraph.legacyLatencyMetricNames" - legacyLatencyUnitMs = "processor.servicegraph.legacyLatencyUnitMs" -) - -var virtualNodeFeatureGate, legacyMetricNamesFeatureGate, legacyLatencyUnitMsFeatureGate *featuregate.Gate - -func init() { - virtualNodeFeatureGate = featuregate.GlobalRegistry().MustRegister( - virtualNodeFeatureGateID, - featuregate.StageAlpha, - featuregate.WithRegisterDescription("When enabled, when the edge expires, processor checks if it has peer attributes(`db.name, net.sock.peer.addr, net.peer.name, rpc.service, http.url, http.target`), and then aggregate the metrics with virtual node."), - featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/17196"), - ) - // TODO: Remove this feature gate when the legacy metric names are removed. - legacyMetricNamesFeatureGate = featuregate.GlobalRegistry().MustRegister( - legacyLatencyMetricNamesFeatureGateID, - featuregate.StageAlpha, // Alpha because we want it disabled by default. - featuregate.WithRegisterDescription("When enabled, processor uses legacy latency metric names."), - featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/18743,https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16578"), - ) - legacyLatencyUnitMsFeatureGate = featuregate.GlobalRegistry().MustRegister( - legacyLatencyUnitMs, - featuregate.StageAlpha, // Alpha because we want it disabled by default. - featuregate.WithRegisterDescription("When enabled, processor reports latency in milliseconds, instead of seconds."), - featuregate.WithRegisterReferenceURL("https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27488"), - ) -} - -// NewFactory creates a factory for the servicegraph processor. -func NewFactory() processor.Factory { - return processor.NewFactory( - typeStr, - createDefaultConfig, - processor.WithTraces(createTracesProcessor, connectorStability), - ) -} - -// NewConnectorFactoryFunc creates a function that returns a factory for the servicegraph connector. -var NewConnectorFactoryFunc = func(cfgType component.Type, tracesToMetricsStability component.StabilityLevel) connector.Factory { - return connector.NewFactory( - cfgType, - createDefaultConfig, - connector.WithTracesToMetrics(createTracesToMetricsConnector, tracesToMetricsStability), - ) -} - -func createDefaultConfig() component.Config { - return &Config{ - Store: StoreConfig{ - TTL: 2 * time.Second, - MaxItems: 1000, - }, - CacheLoop: time.Minute, - StoreExpirationLoop: 2 * time.Second, - } -} - -func createTracesProcessor(_ context.Context, params processor.CreateSettings, cfg component.Config, nextConsumer consumer.Traces) (processor.Traces, error) { - p := newProcessor(params.TelemetrySettings, cfg) - p.tracesConsumer = nextConsumer - return p, nil -} - -func createTracesToMetricsConnector(_ context.Context, params connector.CreateSettings, cfg component.Config, nextConsumer consumer.Metrics) (connector.Traces, error) { - c := newProcessor(params.TelemetrySettings, cfg) - c.metricsConsumer = nextConsumer - return c, nil -} diff --git a/processor/servicegraphprocessor/factory_test.go b/processor/servicegraphprocessor/factory_test.go deleted file mode 100644 index 27e96627f76a..000000000000 --- a/processor/servicegraphprocessor/factory_test.go +++ /dev/null @@ -1,100 +0,0 @@ -// Copyright The OpenTelemetry Authors -// SPDX-License-Identifier: Apache-2.0 - -package servicegraphprocessor - -import ( - "context" - "testing" - "time" - - "github.com/stretchr/testify/assert" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/connector/connectortest" - "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/processor/processortest" -) - -func TestNewProcessor(t *testing.T) { - for _, tc := range []struct { - name string - latencyHistogramBuckets []time.Duration - expectedLatencyHistogramBuckets []float64 - }{ - { - name: "simplest config (use defaults)", - expectedLatencyHistogramBuckets: defaultLatencyHistogramBuckets, - }, - { - name: "latency histogram configured with catch-all bucket to check no additional catch-all bucket inserted", - latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, - expectedLatencyHistogramBuckets: []float64{0.002}, - }, - { - name: "full config with no catch-all bucket and check the catch-all bucket is inserted", - latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, - expectedLatencyHistogramBuckets: []float64{0.002}, - }, - } { - t.Run(tc.name, func(t *testing.T) { - // Prepare - factory := NewFactory() - - creationParams := processortest.NewNopCreateSettings() - cfg := factory.CreateDefaultConfig().(*Config) - cfg.LatencyHistogramBuckets = tc.latencyHistogramBuckets - - // Test - traceProcessor, err := factory.CreateTracesProcessor(context.Background(), creationParams, cfg, consumertest.NewNop()) - smp := traceProcessor.(*serviceGraphProcessor) - - // Verify - assert.NoError(t, err) - assert.NotNil(t, smp) - - assert.Equal(t, tc.expectedLatencyHistogramBuckets, smp.reqDurationBounds) - }) - } -} - -func TestNewConnector(t *testing.T) { - for _, tc := range []struct { - name string - latencyHistogramBuckets []time.Duration - expectedLatencyHistogramBuckets []float64 - }{ - { - name: "simplest config (use defaults)", - expectedLatencyHistogramBuckets: defaultLatencyHistogramBuckets, - }, - { - name: "latency histogram configured with catch-all bucket to check no additional catch-all bucket inserted", - latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, - expectedLatencyHistogramBuckets: []float64{0.002}, - }, - { - name: "full config with no catch-all bucket and check the catch-all bucket is inserted", - latencyHistogramBuckets: []time.Duration{2 * time.Millisecond}, - expectedLatencyHistogramBuckets: []float64{0.002}, - }, - } { - t.Run(tc.name, func(t *testing.T) { - // Prepare - factory := NewConnectorFactoryFunc("servicegraph", component.StabilityLevelAlpha) - - creationParams := connectortest.NewNopCreateSettings() - cfg := factory.CreateDefaultConfig().(*Config) - cfg.LatencyHistogramBuckets = tc.latencyHistogramBuckets - - // Test - conn, err := factory.CreateTracesToMetrics(context.Background(), creationParams, cfg, consumertest.NewNop()) - smc := conn.(*serviceGraphProcessor) - - // Verify - assert.NoError(t, err) - assert.NotNil(t, smc) - - assert.Equal(t, tc.expectedLatencyHistogramBuckets, smc.reqDurationBounds) - }) - } -} diff --git a/processor/servicegraphprocessor/generated_component_test.go b/processor/servicegraphprocessor/generated_component_test.go deleted file mode 100644 index d9ec6b5bca4f..000000000000 --- a/processor/servicegraphprocessor/generated_component_test.go +++ /dev/null @@ -1,98 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package servicegraphprocessor - -import ( - "context" - "testing" - - "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/component/componenttest" - - "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/processor" - "go.opentelemetry.io/collector/processor/processortest" - - "go.opentelemetry.io/collector/confmap/confmaptest" - - "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" -) - -// assertNoErrorHost implements a component.Host that asserts that there were no errors. -type assertNoErrorHost struct { - component.Host - *testing.T -} - -var _ component.Host = (*assertNoErrorHost)(nil) - -func TestComponentLifecycle(t *testing.T) { - factory := NewFactory() - - tests := []struct { - name string - createFn func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) - }{ - - { - name: "traces", - createFn: func(ctx context.Context, set processor.CreateSettings, cfg component.Config) (component.Component, error) { - return factory.CreateTracesProcessor(ctx, set, cfg, consumertest.NewNop()) - }, - }, - } - - 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, component.UnmarshalConfig(sub, cfg)) - - for _, test := range tests { - t.Run(test.name+"-shutdown", func(t *testing.T) { - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) - require.NoError(t, err) - err = c.Shutdown(context.Background()) - require.NoError(t, err) - }) - - t.Run(test.name+"-lifecycle", func(t *testing.T) { - - // TODO support lifecycle - t.SkipNow() - - c, err := test.createFn(context.Background(), processortest.NewNopCreateSettings(), cfg) - require.NoError(t, err) - host := componenttest.NewNopHost() - err = c.Start(context.Background(), host) - require.NoError(t, err) - require.NotPanics(t, func() { - switch e := c.(type) { - case processor.Logs: - logs := testdata.GenerateLogsManyLogRecordsSameResource(2) - if !e.Capabilities().MutatesData { - logs.MarkReadOnly() - } - err = e.ConsumeLogs(context.Background(), logs) - case processor.Metrics: - metrics := testdata.GenerateMetricsTwoMetrics() - if !e.Capabilities().MutatesData { - metrics.MarkReadOnly() - } - err = e.ConsumeMetrics(context.Background(), metrics) - case processor.Traces: - traces := testdata.GenerateTracesTwoSpansSameResource() - if !e.Capabilities().MutatesData { - traces.MarkReadOnly() - } - err = e.ConsumeTraces(context.Background(), traces) - } - }) - require.NoError(t, err) - err = c.Shutdown(context.Background()) - require.NoError(t, err) - }) - } -} diff --git a/processor/servicegraphprocessor/go.mod b/processor/servicegraphprocessor/go.mod deleted file mode 100644 index 65d1e5e83e61..000000000000 --- a/processor/servicegraphprocessor/go.mod +++ /dev/null @@ -1,127 +0,0 @@ -// Deprecated: the service graph processor is deprecated and will be removed in future versions. Use the service graph connector instead. -module github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor - -go 1.20 - -require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 - github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/otel/metric v1.22.0 - go.opentelemetry.io/otel/sdk/metric v1.22.0 - go.opentelemetry.io/otel/trace v1.22.0 - go.uber.org/goleak v1.3.0 - go.uber.org/zap v1.26.0 -) - -require ( - cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.2.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/golang/snappy v0.0.4 // indirect - github.com/google/uuid v1.5.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.4 // 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.0.1 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // 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/mostynb/go-grpc-compression v1.2.2 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_golang v1.18.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.46.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect - github.com/shirou/gopsutil/v3 v3.23.12 // indirect - github.com/shoenig/go-m1cpu v0.1.6 // indirect - github.com/spf13/cobra v1.8.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/tklauser/go-sysconf v0.3.12 // indirect - github.com/tklauser/numcpus v0.6.1 // indirect - github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/contrib/config v0.2.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect - go.opentelemetry.io/otel v1.22.0 // indirect - go.opentelemetry.io/otel/bridge/opencensus v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 // indirect - go.opentelemetry.io/otel/sdk v1.22.0 // indirect - go.opentelemetry.io/proto/otlp v1.0.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/text v0.14.0 // indirect - gonum.org/v1/gonum v0.14.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect - google.golang.org/grpc v1.61.0 // indirect - google.golang.org/protobuf v1.32.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) - -retract ( - v0.76.2 - v0.76.1 - v0.65.0 -) - -// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules -replace cloud.google.com/go v0.65.0 => cloud.google.com/go v0.110.10 - -replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest - -replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden diff --git a/processor/servicegraphprocessor/go.sum b/processor/servicegraphprocessor/go.sum deleted file mode 100644 index a4e93f4b8171..000000000000 --- a/processor/servicegraphprocessor/go.sum +++ /dev/null @@ -1,338 +0,0 @@ -cloud.google.com/go v0.26.0 h1:e0WKqKTd5BnrG8aKH3J3h+QvEIQtSUcf2n5UZ5ZgLtQ= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68 h1:aRVqY1p2IJaBGStWMsQMpkAa83cPkCDLl80eOj0Rbz4= -cloud.google.com/go/compute/metadata v0.2.4-0.20230617002413-005d2dfb6b68/go.mod h1:1a3eRNYX12fs5UABBIXS8HXVvQbX9hRB/RkEBPORpe8= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -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.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= -github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/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/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbinPNFs5gPSBOsJtx3wTT94VBY= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/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-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= -github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/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.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= -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.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= -github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8kKbZwNZBNPuTTje8U= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= -github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -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/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -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.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= -github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -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/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= -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/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= -github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqScV0Y= -github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= -github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= -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/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= -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/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.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= -github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= -go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= -go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= -go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= -go.opentelemetry.io/contrib/propagators/b3 v1.22.0/go.mod h1:N3z0ycFRhsVZ+tG/uavMxHvOvFE95QM6gwW1zSqT9dQ= -go.opentelemetry.io/contrib/zpages v0.47.0 h1:ekpdNa2wqOvAfwZIGDIIV02zmR+z08aWPt21KrPJnaU= -go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= -go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= -go.opentelemetry.io/otel/bridge/opencensus v0.45.0 h1:kEOlv9Exuv3J8GCf1nLMHfrTPGnZOuIkN8YlRM14TtQ= -go.opentelemetry.io/otel/bridge/opencensus v0.45.0/go.mod h1:tkVMJeFOr43+zzwbxtIWsNcCCDT7rI5/c9rhMfMIENg= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0/go.mod h1:AKFZIEPOnqB00P63bTjOiah4ZTaRzl1TKwUWpZdYUHI= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 h1:+RbSCde0ERway5FwKvXR3aRJIFeDu9rtwC6E7BC6uoM= -go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0/go.mod h1:zcI8u2EJxbLPyoZ3SkVAAcQPgYb1TDRzW93xLFnsggU= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 h1:H2JFgRcGiyHg7H7bwcwaQJYrNFqCqrbTQ8K4p1OvDu8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0/go.mod h1:WfCWp1bGoYK8MeULtI15MmQVczfR+bFkk0DF3h06QmQ= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY= -go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= -go.opentelemetry.io/otel/exporters/prometheus v0.45.0/go.mod h1:UVJZPLnfDSvHj+eJuZE+E1GjIBD267mEMfAAHJdghWg= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0 h1:NjN6zc7Mwy9torqa3mo+pMJ3mHoPI0uzVSYcqB2t72A= -go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.45.0/go.mod h1:U+T5v2bk4fCC8XdSEWZja3Pm/ZhvV/zE7JwX/ELJKts= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0 h1:zr8ymM5OWWjjiWRzwTfZ67c905+2TMHYp2lMJ52QTyM= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.22.0/go.mod h1:sQs7FT2iLVJ+67vYngGJkPe1qr39IzaBzaj9IDNNY8k= -go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= -go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= -go.opentelemetry.io/otel/sdk v1.22.0 h1:6coWHw9xw7EfClIC/+O31R8IY3/+EiRFHevmHafB2Gw= -go.opentelemetry.io/otel/sdk v1.22.0/go.mod h1:iu7luyVGYovrRpe2fmj3CVKouQNdTOkxtLzPvPz1DOc= -go.opentelemetry.io/otel/sdk/metric v1.22.0 h1:ARrRetm1HCVxq0cbnaZQlfwODYJHo3gFL8Z3tSmHBcI= -go.opentelemetry.io/otel/sdk/metric v1.22.0/go.mod h1:KjQGeMIDlBNEOo6HvjhxIec1p/69/kULDcp4gr0oLQQ= -go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= -go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= -go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I= -go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM= -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.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= -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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/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-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-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.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -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.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.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.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-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= -gonum.org/v1/gonum v0.14.0 h1:2NiG67LD1tEH0D7kM+ps2V+fXmsAnpUeec7n8tcr4S0= -gonum.org/v1/gonum v0.14.0/go.mod h1:AoWeoz0becf9QMWtE8iWXNXc27fK4fNeHNf/oMejGfU= -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.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= -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-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg= -google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= -google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM= -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= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.61.0 h1:TOvOcuXn30kRao+gfcvsebNEa5iZIiLkisYEkf7R7o0= -google.golang.org/grpc v1.61.0/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -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.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -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/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/processor/servicegraphprocessor/internal/metadata/generated_status.go b/processor/servicegraphprocessor/internal/metadata/generated_status.go deleted file mode 100644 index 8b4f1a6ffb95..000000000000 --- a/processor/servicegraphprocessor/internal/metadata/generated_status.go +++ /dev/null @@ -1,22 +0,0 @@ -// Code generated by mdatagen. DO NOT EDIT. - -package metadata - -import ( - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/otel/metric" - "go.opentelemetry.io/otel/trace" -) - -const ( - Type = "servicegraph" - TracesStability = component.StabilityLevelDeprecated -) - -func Meter(settings component.TelemetrySettings) metric.Meter { - return settings.MeterProvider.Meter("otelcol/servicegraph") -} - -func Tracer(settings component.TelemetrySettings) trace.Tracer { - return settings.TracerProvider.Tracer("otelcol/servicegraph") -} diff --git a/processor/servicegraphprocessor/metadata.yaml b/processor/servicegraphprocessor/metadata.yaml deleted file mode 100644 index f2fb89d91606..000000000000 --- a/processor/servicegraphprocessor/metadata.yaml +++ /dev/null @@ -1,14 +0,0 @@ -type: servicegraph - -status: - class: processor - stability: - deprecated: [traces] - distributions: [contrib, sumo] - warnings: [] - codeowners: - active: [jpkrohling, mapno] - -tests: - config: - skip_lifecycle: true diff --git a/processor/servicegraphprocessor/testdata/service-graph-config.yaml b/processor/servicegraphprocessor/testdata/service-graph-config.yaml deleted file mode 100644 index 29406316cc5c..000000000000 --- a/processor/servicegraphprocessor/testdata/service-graph-config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -receivers: - nop: - -exporters: - nop: - -processors: - servicegraph: - metrics_exporter: metrics - latency_histogram_buckets: [1,2,3,4,5] - dimensions: - - dimension-1 - - dimension-2 - store: - ttl: 1s - max_items: 10 - cache_loop: 2m - store_expiration_loop: 10s - virtual_node_peer_attributes: - - db.name - - rpc.service - -service: - pipelines: - traces: - receivers: [nop] - processors: [servicegraph] - exporters: [nop] diff --git a/reports/distributions/contrib.yaml b/reports/distributions/contrib.yaml index b746e237753d..9cb33e5783bb 100644 --- a/reports/distributions/contrib.yaml +++ b/reports/distributions/contrib.yaml @@ -90,7 +90,6 @@ components: - resource - resourcedetection - routing - - servicegraph - span - spanmetrics - sumologic diff --git a/reports/distributions/sumo.yaml b/reports/distributions/sumo.yaml index 1e24d12af5a4..586a09756347 100644 --- a/reports/distributions/sumo.yaml +++ b/reports/distributions/sumo.yaml @@ -57,7 +57,6 @@ components: - resourcedetection - routing - schema - - servicegraph - span - spanmetrics - sumologic diff --git a/versions.yaml b/versions.yaml index 63e267d2e380..bf624c473305 100644 --- a/versions.yaml +++ b/versions.yaml @@ -161,7 +161,6 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/schemaprocessor - - github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/processor/sumologicprocessor From fd68080daff3a8062027ddbda13341e046623ebb Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 2 Feb 2024 10:24:23 -0600 Subject: [PATCH 04/18] [chore][pkg/stanza] Remove flushUncombined function from recombine operator (#30999) Resolves https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/22140 --- .../transformer/recombine/recombine.go | 20 +++---------------- .../transformer/recombine/recombine_test.go | 19 ++++++++++++------ 2 files changed, 16 insertions(+), 23 deletions(-) diff --git a/pkg/stanza/operator/transformer/recombine/recombine.go b/pkg/stanza/operator/transformer/recombine/recombine.go index 429ac1f9d03f..411f4463b404 100644 --- a/pkg/stanza/operator/transformer/recombine/recombine.go +++ b/pkg/stanza/operator/transformer/recombine/recombine.go @@ -273,12 +273,11 @@ func (r *Transformer) matchIndicatesLast() bool { func (r *Transformer) addToBatch(ctx context.Context, e *entry.Entry, source string) { batch, ok := r.batchMap[source] if !ok { - batch = r.addNewBatch(source, e) if len(r.batchMap) >= r.maxSources { - r.Error("Batched source exceeds max source size. Flushing all batched logs. Consider increasing max_sources parameter") - r.flushUncombined(context.Background()) - return + r.Error("Too many sources. Flushing all batched logs. Consider increasing max_sources parameter") + r.flushAllSources(ctx) } + batch = r.addNewBatch(source, e) } else { // If the length of the batch is 0, this batch was flushed previously due to triggering size limit. // In this case, the firstEntryObservedTime should be updated to reset the timeout @@ -309,19 +308,6 @@ func (r *Transformer) addToBatch(ctx context.Context, e *entry.Entry, source str } -// flushUncombined flushes all the logs in the batch individually to the -// next output in the pipeline. This is only used when there is an error -// or at shutdown to avoid dropping the logs. -func (r *Transformer) flushUncombined(ctx context.Context) { - for source := range r.batchMap { - for _, entry := range r.batchMap[source].entries { - r.Write(ctx, entry) - } - r.removeBatch(source) - } - r.ticker.Reset(r.forceFlushTimeout) -} - // flushAllSources flushes all sources. func (r *Transformer) flushAllSources(ctx context.Context) { var errs []error diff --git a/pkg/stanza/operator/transformer/recombine/recombine_test.go b/pkg/stanza/operator/transformer/recombine/recombine_test.go index 34e1ee29cc44..fffa50ce4c89 100644 --- a/pkg/stanza/operator/transformer/recombine/recombine_test.go +++ b/pkg/stanza/operator/transformer/recombine/recombine_test.go @@ -381,15 +381,22 @@ func TestTransformer(t *testing.T) { cfg.IsLastEntry = "body == 'end'" cfg.OutputIDs = []string{"fake"} cfg.MaxSources = 1 + cfg.OverwriteWith = "oldest" + cfg.ForceFlushTimeout = 10 * time.Millisecond return cfg }(), []*entry.Entry{ - entryWithBodyAttr(t1, "file1", map[string]string{"file.path": "file1"}), - entryWithBodyAttr(t2, "end", map[string]string{"file.path": "file1"}), + entryWithBodyAttr(t1, "start1", map[string]string{"file.path": "file1"}), + entryWithBodyAttr(t1.Add(10*time.Millisecond), "middle1", map[string]string{"file.path": "file1"}), + entryWithBodyAttr(t2, "start2", map[string]string{"file.path": "file2"}), + entryWithBodyAttr(t2.Add(10*time.Millisecond), "middle2", map[string]string{"file.path": "file2"}), + entryWithBodyAttr(t2.Add(20*time.Millisecond), "end2", map[string]string{"file.path": "file2"}), }, []*entry.Entry{ - entryWithBodyAttr(t1, "file1", map[string]string{"file.path": "file1"}), - entryWithBodyAttr(t2, "end", map[string]string{"file.path": "file1"}), + // First entry is booted before end comes in, but partial recombination should occur + entryWithBodyAttr(t1.Add(10*time.Millisecond), "start1\nmiddle1", map[string]string{"file.path": "file1"}), + // Second entry is flushed automatically when end comes in + entryWithBodyAttr(t2.Add(20*time.Millisecond), "start2\nmiddle2\nend2", map[string]string{"file.path": "file2"}), }, }, { @@ -591,7 +598,7 @@ func BenchmarkRecombine(b *testing.B) { for _, e := range entries { require.NoError(b, recombine.Process(ctx, e)) } - recombine.flushUncombined(ctx) + recombine.flushAllSources(ctx) } } @@ -630,7 +637,7 @@ func BenchmarkRecombineLimitTrigger(b *testing.B) { require.NoError(b, recombine.Process(ctx, next)) require.NoError(b, recombine.Process(ctx, start)) require.NoError(b, recombine.Process(ctx, next)) - recombine.flushUncombined(ctx) + recombine.flushAllSources(ctx) } } From c11044b55072e2108c730ce3c7f67dd27f86722e Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 2 Feb 2024 10:43:00 -0600 Subject: [PATCH 05/18] [chore][pkg/stanza] Remove unnecessary slice of entries (#31000) Depends on https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/30999 We are already aggregating the "recombined field" into a buffer, so we don't need to keep a handle to all recombined entries. --- .../transformer/recombine/recombine.go | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/pkg/stanza/operator/transformer/recombine/recombine.go b/pkg/stanza/operator/transformer/recombine/recombine.go index 411f4463b404..7580f8c87055 100644 --- a/pkg/stanza/operator/transformer/recombine/recombine.go +++ b/pkg/stanza/operator/transformer/recombine/recombine.go @@ -117,7 +117,6 @@ func (c *Config) Build(logger *zap.SugaredLogger) (operator.Operator, error) { batchPool: sync.Pool{ New: func() any { return &sourceBatch{ - entries: []*entry.Entry{}, recombined: &bytes.Buffer{}, } }, @@ -156,7 +155,8 @@ type Transformer struct { // sourceBatch contains the status info of a batch type sourceBatch struct { - entries []*entry.Entry + baseEntry *entry.Entry + numEntries int recombined *bytes.Buffer firstEntryObservedTime time.Time } @@ -279,12 +279,10 @@ func (r *Transformer) addToBatch(ctx context.Context, e *entry.Entry, source str } batch = r.addNewBatch(source, e) } else { - // If the length of the batch is 0, this batch was flushed previously due to triggering size limit. - // In this case, the firstEntryObservedTime should be updated to reset the timeout - if len(batch.entries) == 0 { - batch.firstEntryObservedTime = e.ObservedTimestamp + batch.numEntries++ + if r.overwriteWithOldest { + batch.baseEntry = e } - batch.entries = append(batch.entries, e) } // Combine the combineField of each entry in the batch, @@ -300,7 +298,7 @@ func (r *Transformer) addToBatch(ctx context.Context, e *entry.Entry, source str } batch.recombined.WriteString(s) - if (r.maxLogSize > 0 && int64(batch.recombined.Len()) > r.maxLogSize) || len(batch.entries) >= r.maxBatchSize { + if (r.maxLogSize > 0 && int64(batch.recombined.Len()) > r.maxLogSize) || batch.numEntries >= r.maxBatchSize { if err := r.flushSource(ctx, source); err != nil { r.Errorf("there was error flushing combined logs %s", err) } @@ -330,28 +328,18 @@ func (r *Transformer) flushSource(ctx context.Context, source string) error { return nil } - if len(batch.entries) == 0 { + if batch.baseEntry == nil { r.removeBatch(source) return nil } - // Choose which entry we want to keep the rest of the fields from - var base *entry.Entry - entries := batch.entries - - if r.overwriteWithOldest { - base = entries[len(entries)-1] - } else { - base = entries[0] - } - // Set the recombined field on the entry - err := base.Set(r.combineField, batch.recombined.String()) + err := batch.baseEntry.Set(r.combineField, batch.recombined.String()) if err != nil { return err } - r.Write(ctx, base) + r.Write(ctx, batch.baseEntry) r.removeBatch(source) return nil } @@ -359,7 +347,8 @@ func (r *Transformer) flushSource(ctx context.Context, source string) error { // addNewBatch creates a new batch for the given source and adds the entry to it. func (r *Transformer) addNewBatch(source string, e *entry.Entry) *sourceBatch { batch := r.batchPool.Get().(*sourceBatch) - batch.entries = append(batch.entries[:0], e) + batch.baseEntry = e + batch.numEntries = 1 batch.recombined.Reset() batch.firstEntryObservedTime = e.ObservedTimestamp r.batchMap[source] = batch From b25e9de2a58513708f0d2ba46ff2596444c5de5c Mon Sep 17 00:00:00 2001 From: Ye Ji Date: Fri, 2 Feb 2024 11:46:28 -0500 Subject: [PATCH 06/18] [receiver/journald]: add support for `all` configuration (#30971) **Description:** This commit adds support for `all` to journald receiver, which allows full output, including unprintable characters and lines that are too long. **Link to tracking Issue:** #30920 **Testing:** unit test and manual test. **Documentation:** receiver/journaldreceiver/README.md and pkg/stanza/docs/operators/journald_input.md --- .chloggen/add-all-to-journald-receiver.yaml | 27 +++++++++++++++++++ pkg/stanza/docs/operators/journald_input.md | 1 + pkg/stanza/operator/input/journald/config.go | 1 + .../operator/input/journald/journald.go | 4 +++ .../operator/input/journald/journald_test.go | 7 +++++ receiver/journaldreceiver/README.md | 1 + 6 files changed, 41 insertions(+) create mode 100755 .chloggen/add-all-to-journald-receiver.yaml diff --git a/.chloggen/add-all-to-journald-receiver.yaml b/.chloggen/add-all-to-journald-receiver.yaml new file mode 100755 index 000000000000..8cdb7a193178 --- /dev/null +++ b/.chloggen/add-all-to-journald-receiver.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: receiver/journald + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: add a new config option "all" that turns on full output from journalctl, including lines that are too long. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [30920] + +# (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/pkg/stanza/docs/operators/journald_input.md b/pkg/stanza/docs/operators/journald_input.md index b4c8d358f26b..f1643d7de1b0 100644 --- a/pkg/stanza/docs/operators/journald_input.md +++ b/pkg/stanza/docs/operators/journald_input.md @@ -21,6 +21,7 @@ The `journald_input` operator will use the `__REALTIME_TIMESTAMP` field of the j | `start_at` | `end` | At startup, where to start reading logs from the file. Options are `beginning` or `end`. | | `attributes` | {} | A map of `key: value` pairs to add to the entry's attributes. | | `resource` | {} | A map of `key: value` pairs to add to the entry's resource. | +| `all` | 'false' | If `true`, very long logs and logs with unprintable characters will also be included. | ### Example Configurations diff --git a/pkg/stanza/operator/input/journald/config.go b/pkg/stanza/operator/input/journald/config.go index 7f2afec5bcac..e7af99b14f24 100644 --- a/pkg/stanza/operator/input/journald/config.go +++ b/pkg/stanza/operator/input/journald/config.go @@ -36,6 +36,7 @@ type Config struct { Identifiers []string `mapstructure:"identifiers,omitempty"` Grep string `mapstructure:"grep,omitempty"` Dmesg bool `mapstructure:"dmesg,omitempty"` + All bool `mapstructure:"all,omitempty"` } type MatchConfig map[string]string diff --git a/pkg/stanza/operator/input/journald/journald.go b/pkg/stanza/operator/input/journald/journald.go index 24a35f1d9f70..477427df7edc 100644 --- a/pkg/stanza/operator/input/journald/journald.go +++ b/pkg/stanza/operator/input/journald/journald.go @@ -113,6 +113,10 @@ func (c Config) buildArgs() ([]string, error) { args = append(args, matches...) } + if c.All { + args = append(args, "--all") + } + return args, nil } diff --git a/pkg/stanza/operator/input/journald/journald_test.go b/pkg/stanza/operator/input/journald/journald_test.go index 40650e056964..29bc15503e8b 100644 --- a/pkg/stanza/operator/input/journald/journald_test.go +++ b/pkg/stanza/operator/input/journald/journald_test.go @@ -203,6 +203,13 @@ func TestBuildConfig(t *testing.T) { }, Expected: []string{"--utc", "--output=json", "--follow", "--priority", "info", "--dmesg"}, }, + { + Name: "all", + Config: func(cfg *Config) { + cfg.All = true + }, + Expected: []string{"--utc", "--output=json", "--follow", "--priority", "info", "--all"}, + }, } for _, tt := range testCases { diff --git a/receiver/journaldreceiver/README.md b/receiver/journaldreceiver/README.md index ddb41bdd11be..4ad8e271b6a6 100644 --- a/receiver/journaldreceiver/README.md +++ b/receiver/journaldreceiver/README.md @@ -35,6 +35,7 @@ Journald receiver requires that: | `grep` | | Filter output to entries where the MESSAGE= field matches the specified regular expression. See [Multiple filtering options](#multiple-filtering-options) examples. | | `dmesg` | 'false' | Show only kernel messages. This shows logs from current boot and adds the match `_TRANSPORT=kernel`. See [Multiple filtering options](#multiple-filtering-options) examples. | | `storage` | none | The ID of a storage extension to be used to store cursors. Cursors allow the receiver to pick up where it left off in the case of a collector restart. If no storage extension is used, the receiver will manage cursors in memory only. | +| `all` | 'false' | If `true`, very long logs and logs with unprintable characters will also be included. | | `retry_on_failure.enabled` | `false` | If `true`, the receiver will pause reading a file and attempt to resend the current batch of logs if it encounters an error from downstream components. | | `retry_on_failure.initial_interval` | `1 second` | Time to wait after the first failure before retrying. | | `retry_on_failure.max_interval` | `30 seconds` | Upper bound on retry backoff interval. Once this value is reached the delay between consecutive retries will remain constant at the specified value. | From 3e4b3a6463fc8a37c80353ffd7470e4d5ccd7bff Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Fri, 2 Feb 2024 17:42:10 +0000 Subject: [PATCH 07/18] [connector,exporter,processor,internal/datadog] Bump opentelemetry-mapping-go to v0.13.2 (#31019) Updates opentelemetry-mapping-go to v0.13.2 **Link to tracking Issue:** Fixes DataDog/opentelemetry-mapping-go/issues/252 --- .chloggen/mx-psi_update-v0.13.2.yaml | 27 +++++++++++++++++++ cmd/configschema/go.mod | 10 +++---- cmd/configschema/go.sum | 22 +++++++-------- cmd/otelcontribcol/go.mod | 10 +++---- cmd/otelcontribcol/go.sum | 22 +++++++-------- connector/datadogconnector/go.mod | 10 +++---- connector/datadogconnector/go.sum | 22 +++++++-------- exporter/datadogexporter/go.mod | 10 +++---- exporter/datadogexporter/go.sum | 22 +++++++-------- .../datadogexporter/integrationtest/go.mod | 10 +++---- .../datadogexporter/integrationtest/go.sum | 22 +++++++-------- go.mod | 10 +++---- go.sum | 22 +++++++-------- internal/datadog/go.mod | 6 ++--- internal/datadog/go.sum | 18 ++++++------- processor/datadogprocessor/go.mod | 6 ++--- processor/datadogprocessor/go.sum | 14 +++++----- 17 files changed, 145 insertions(+), 118 deletions(-) create mode 100755 .chloggen/mx-psi_update-v0.13.2.yaml diff --git a/.chloggen/mx-psi_update-v0.13.2.yaml b/.chloggen/mx-psi_update-v0.13.2.yaml new file mode 100755 index 000000000000..c10ec7d78076 --- /dev/null +++ b/.chloggen/mx-psi_update-v0.13.2.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 empty histograms were not being sent to the backend in the distributions mode. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [31019] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index e004dbdfd865..df5367a2ba62 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -25,8 +25,8 @@ 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/resources/armresources v1.2.0 // indirect github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 // indirect github.com/gocql/gocql v1.6.0 // indirect github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.93.0 // indirect @@ -232,9 +232,9 @@ require ( github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index 39292bc23e68..dc0b2c1b3433 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -178,17 +178,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index d5def7f001d8..12f9ad8e66d1 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -279,11 +279,11 @@ require ( github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index f0e53c007001..97922f3b34c3 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -177,17 +177,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index 6d27e4c629fe..c9330ff23974 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel github.com/DataDog/datadog-agent/pkg/trace v0.50.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 @@ -42,9 +42,9 @@ require ( github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index 66f0b8f72a58..c1eff0990280 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -68,17 +68,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 50b6da93caa2..77155da0524b 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/DataDog/datadog-agent/pkg/trace v0.50.2 github.com/DataDog/datadog-api-client-go/v2 v2.21.0 github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 github.com/DataDog/sketches-go v1.4.4 github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 github.com/aws/aws-sdk-go v1.50.7 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index c6009ff9a74f..5830e7dc9a92 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -90,17 +90,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 958538b09f7c..2b16619240b0 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -43,11 +43,11 @@ require ( github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.21.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 57ca78b9b338..37e6c42bab7a 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -68,17 +68,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= diff --git a/go.mod b/go.mod index 37084d15cfcf..929b936553cf 100644 --- a/go.mod +++ b/go.mod @@ -247,11 +247,11 @@ require ( github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/DataDog/zstd v1.5.2 // indirect github.com/GehirnInc/crypt v0.0.0-20200316065508-bb7000b8a962 // indirect diff --git a/go.sum b/go.sum index a2b05e867d52..01143ee20c66 100644 --- a/go.sum +++ b/go.sum @@ -182,17 +182,17 @@ github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee h1:tXibLZk3G6HncIFJKaNItsdzcrk4YqILNDZlXPTNt4k= github.com/DataDog/gohai v0.0.0-20230524154621-4316413895ee/go.mod h1:nTot/Iy0kW16bXgXr6blEc8gFeAS7vTqYlhAxh+dbc0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1 h1:MwXEMqL/aThmkdLKSABXRb+/qoyCq5Z3+1IPPB6L/m0= -github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.1/go.mod h1:ODbHm4iVWmn16ruFXY7uMC0LNaZaGWHBqu0VR8efIsk= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1 h1:S9pLye2reYfPUOV4FXSkRvsDt6OwIGyGAIgXTNErhL4= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.1/go.mod h1:3luUUR9mBoHiMRh+PrWmySpXMOntTd/7fCl2UTu4Axg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2 h1:9xUPi4L6HwM9uB4rkKuoFGrpyCiv6Xm0NaBtkeCJhoI= +github.com/DataDog/opentelemetry-mapping-go/pkg/inframetadata v0.13.2/go.mod h1:m4btyxCu5NuyxCL9iX4Sa3fNb5deCsVMSWIlF18tQ0E= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2 h1:9eWdRXsKcFdVyyjg1AVrKhwLRL7/7Cp8nKG5QISwFKQ= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/logs v0.13.2/go.mod h1:1br0HgzhDIYcnVrx4dkkmRmdGrj/4iastO6TFcQkcbg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 683fa7f3080c..3c0f0e04c2df 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel github.com/DataDog/datadog-agent/pkg/trace v0.50.2 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 @@ -21,8 +21,8 @@ require ( github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/DataDog/sketches-go v1.4.4 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index b08dc40c23ab..3e39335fdf86 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -20,13 +20,13 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= @@ -108,8 +108,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.92.0 h1:2cjUFC0jNSqAYcO+ZWUQ8sqPZdAX03Bd90SpsGcnrNY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.92.0 h1:sqs1y0Exyxons2mWMAmBSdcdl2UizUgOmoibEBRX/4I= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 h1:R0GGB09OWAP1bSVps2brDOOln8pgSgzHU658bdzIb+g= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 h1:2AKT1xw2KNenv/nfRoWueYxQiLJe76Axhb5++4jdgiA= github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU= github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/outcaste-io/ristretto v0.2.1 h1:KCItuNIGJZcursqHr3ghO7fc5ddZLEHspL9UR0cQM64= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index ce9994c2b581..474a4623c889 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/proto v0.52.0-devel - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 - github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 + github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 github.com/DataDog/sketches-go v1.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 @@ -35,7 +35,7 @@ require ( github.com/DataDog/datadog-go/v5 v5.1.1 // indirect github.com/DataDog/go-sqllexer v0.0.8 // indirect github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect - github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 // indirect + github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 5e0dfdf2455f..0530027d5b2a 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -20,13 +20,13 @@ github.com/DataDog/go-sqllexer v0.0.8 h1:vfC8R9PhmJfeOKcFYAX9UOd890A3wu3KrjU9Kr7 github.com/DataDog/go-sqllexer v0.0.8/go.mod h1:nB4Ea2YNsqMwtbWMc4Fm/oP98IIrSPapqwOwPioMspY= github.com/DataDog/go-tuf v1.0.2-0.5.2 h1:EeZr937eKAWPxJ26IykAdWA4A0jQXJgkhUjqEI/w7+I= github.com/DataDog/go-tuf v1.0.2-0.5.2/go.mod h1:zBcq6f654iVqmkk8n2Cx81E1JnNTMOAx1UEO/wZR+P0= -github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.1 h1:0ugsTkWG1SrU8WR9sDGhOy4M/iqHY+w5Ali+jzMGetg= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1 h1:mOfJySl1BbvgVHgLsA1ouWHN2QKyd+xksy3hG2TeD68= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.1/go.mod h1:NRv/hOlGq1LrJN1bbY7gJa4upTDTh5ZRW19U5w/wuNQ= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1 h1:z0QDSV9lQbTVoAnOkKiu7SWElWKPwpqGI7OE+OYNCIs= -github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.1/go.mod h1:As+hEGB+/quKDMjxLtMKU9ucSsjrpdk1pXnMNqfwGoU= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1 h1:nd3Zch8xtTALM3ObZ3jBwzbDFtARTN/QVoDCCWXubJE= -github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.1/go.mod h1:xF6NyzghnEeQe9+9d8XiiOzxhDAdvOWOF8dR4dq5DqI= +github.com/DataDog/opentelemetry-mapping-go/pkg/internal/sketchtest v0.13.2 h1:TGGnFPI160L3HGhCN7Y4lXNlH7mFj/uBYdVeQG6lIVo= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2 h1:V5SoRFNeFdidAemhVTGO/zwtPNluN4ZrrqiFLuAT7Us= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.13.2/go.mod h1:Z2FPxYhi8GIFkS4WLC7RrRaGolyB9TqS2RMSwNcmczk= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 h1:IkA9MI8nmY8gbRI9YLI7o7tKmjuTK1nU29cDqyi+sOg= +github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2/go.mod h1:QLz5CEgTHJ91pLOcb2hL8P3+7AKMUIOfXJw2Sr4588o= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2 h1:s06GkbYmWnG7WYmmxOTB0W+1BidVqZ/4oXvyoQmNovE= +github.com/DataDog/opentelemetry-mapping-go/pkg/quantile v0.13.2/go.mod h1:hKaXjBn+Y/KT6otuDA213Y0gtjlK0ylI8uuAho3LKKo= github.com/DataDog/sketches-go v1.4.4 h1:dF52vzXRFSPOj2IjXSWLvXq3jubL4CI69kwYjJ1w5Z8= github.com/DataDog/sketches-go v1.4.4/go.mod h1:XR0ns2RtEEF09mDKXiKZiQg+nfZStrq1ZuL1eezeZe0= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= From 29ecc62c9b3743f82d6a5c7bdc6472fbd474dc87 Mon Sep 17 00:00:00 2001 From: Adriel Perkins Date: Fri, 2 Feb 2024 12:42:37 -0500 Subject: [PATCH 08/18] [chore] add generated lifecycle tests (#31012) Add the lifecycle config to metadata.yaml and generate lifecycle tests. Related to #27850 --- .../generated_component_test.go | 73 +++++++++++++++++++ receiver/gitproviderreceiver/go.mod | 4 +- receiver/gitproviderreceiver/go.sum | 10 +-- receiver/gitproviderreceiver/metadata.yaml | 3 + 4 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 receiver/gitproviderreceiver/generated_component_test.go diff --git a/receiver/gitproviderreceiver/generated_component_test.go b/receiver/gitproviderreceiver/generated_component_test.go new file mode 100644 index 000000000000..be0c3cbc6557 --- /dev/null +++ b/receiver/gitproviderreceiver/generated_component_test.go @@ -0,0 +1,73 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package gitproviderreceiver + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + + "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver" + "go.opentelemetry.io/collector/receiver/receivertest" + + "go.opentelemetry.io/collector/confmap/confmaptest" +) + +// assertNoErrorHost implements a component.Host that asserts that there were no errors. +type assertNoErrorHost struct { + component.Host + *testing.T +} + +var _ component.Host = (*assertNoErrorHost)(nil) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) + }{ + + { + name: "metrics", + createFn: func(ctx context.Context, set receiver.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateMetricsReceiver(ctx, set, cfg, consumertest.NewNop()) + }, + }, + } + + 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, component.UnmarshalConfig(sub, cfg)) + + for _, test := range tests { + t.Run(test.name+"-shutdown", func(t *testing.T) { + c, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + + t.Run(test.name+"-lifecycle", func(t *testing.T) { + + firstRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + require.NoError(t, err) + require.NoError(t, firstRcvr.Start(context.Background(), host)) + require.NoError(t, firstRcvr.Shutdown(context.Background())) + secondRcvr, err := test.createFn(context.Background(), receivertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + require.NoError(t, secondRcvr.Start(context.Background(), host)) + require.NoError(t, secondRcvr.Shutdown(context.Background())) + }) + } +} diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index da5f8a334ea6..acfe63be6b4b 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -64,7 +64,7 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect - github.com/vektah/gqlparser/v2 v2.5.10 // indirect + github.com/vektah/gqlparser/v2 v2.5.11 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect @@ -103,7 +103,7 @@ require ( golang.org/x/text v0.14.0 // indirect gonum.org/v1/gonum v0.14.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe // indirect google.golang.org/grpc v1.61.0 // indirect google.golang.org/protobuf v1.32.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 7c1bf04df53e..6a10e8d6e5a3 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -146,8 +146,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/vektah/gqlparser/v2 v2.5.10 h1:6zSM4azXC9u4Nxy5YmdmGu4uKamfwsdKTwp5zsEealU= -github.com/vektah/gqlparser/v2 v2.5.10/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= +github.com/vektah/gqlparser/v2 v2.5.11 h1:JJxLtXIoN7+3x6MBdtIP59TP1RANnY7pXOaDnADQSf8= +github.com/vektah/gqlparser/v2 v2.5.11/go.mod h1:1rCcfwB2ekJofmluGWXMSEnPMZgbxzwj6FaZ/4OT8Cc= 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.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= @@ -305,11 +305,11 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 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-20231106174013-bbf56f31fb17 h1:wpZ8pe2x1Q3f2KyT5f8oP/fa9rHAKgFPr/HZdNuS+PQ= +google.golang.org/genproto v0.0.0-20240116215550-a9fa1716bcac h1:ZL/Teoy/ZGnzyrqK/Optxxp2pmVh+fmJ97slxSRyzUg= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo= google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe h1:bQnxqljG/wqi4NTXu2+DJ3n7APcEA882QZ1JvhQAq9o= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240125205218-1f4bbc51befe/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= 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/gitproviderreceiver/metadata.yaml b/receiver/gitproviderreceiver/metadata.yaml index 0b9f14d78780..6d2b48183fa3 100644 --- a/receiver/gitproviderreceiver/metadata.yaml +++ b/receiver/gitproviderreceiver/metadata.yaml @@ -50,3 +50,6 @@ metrics: gauge: value_type: int attributes: [repository.name] + +tests: + config: From 4e63de5ed273be88f92ceb4a712f305ecd054d4d Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 2 Feb 2024 13:21:55 -0600 Subject: [PATCH 09/18] [pkg/stanza] Do not log entries on error (#31021) Resolves #26670 --- .chloggen/pkg-stanza-optional-log-entry.yaml | 30 +++++++++++++++++++ pkg/stanza/operator/helper/input.go | 4 +-- pkg/stanza/operator/helper/transformer.go | 2 +- pkg/stanza/operator/output/stdout/stdout.go | 2 +- .../parser/jsonarray/json_array_parser.go | 4 +-- 5 files changed, 36 insertions(+), 6 deletions(-) create mode 100755 .chloggen/pkg-stanza-optional-log-entry.yaml diff --git a/.chloggen/pkg-stanza-optional-log-entry.yaml b/.chloggen/pkg-stanza-optional-log-entry.yaml new file mode 100755 index 000000000000..e1b4f230aad5 --- /dev/null +++ b/.chloggen/pkg-stanza-optional-log-entry.yaml @@ -0,0 +1,30 @@ +# 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: pkg/stanza + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Entries are no longer logged during error conditions. + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [26670] + +# (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 change is being made to ensure sensitive information contained in logs are never logged inadvertently. + This change is a breaking change because it may change user expectations. However, it should require + no action on the part of the user unless they are relying on logs from a few specific error cases. + +# 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/stanza/operator/helper/input.go b/pkg/stanza/operator/helper/input.go index 9b6fa5e44c6e..214fa3242f2a 100644 --- a/pkg/stanza/operator/helper/input.go +++ b/pkg/stanza/operator/helper/input.go @@ -83,8 +83,8 @@ func (i *InputOperator) CanProcess() bool { } // Process will always return an error if called. -func (i *InputOperator) Process(_ context.Context, entry *entry.Entry) error { - i.Errorw("Operator received an entry, but can not process", zap.Any("entry", entry)) +func (i *InputOperator) Process(_ context.Context, _ *entry.Entry) error { + i.Errorw("Operator received an entry, but can not process") return errors.NewError( "Operator can not process logs.", "Ensure that operator is not configured to receive logs from other operators", diff --git a/pkg/stanza/operator/helper/transformer.go b/pkg/stanza/operator/helper/transformer.go index bff10ac58a97..bc19174e44cd 100644 --- a/pkg/stanza/operator/helper/transformer.go +++ b/pkg/stanza/operator/helper/transformer.go @@ -95,7 +95,7 @@ func (t *TransformerOperator) ProcessWith(ctx context.Context, entry *entry.Entr // HandleEntryError will handle an entry error using the on_error strategy. func (t *TransformerOperator) HandleEntryError(ctx context.Context, entry *entry.Entry, err error) error { - t.Errorw("Failed to process entry", zap.Any("error", err), zap.Any("action", t.OnError), zap.Any("entry", entry)) + t.Errorw("Failed to process entry", zap.Any("error", err), zap.Any("action", t.OnError)) if t.OnError == SendOnError { t.Write(ctx, entry) } diff --git a/pkg/stanza/operator/output/stdout/stdout.go b/pkg/stanza/operator/output/stdout/stdout.go index ec1d23814685..e892c7485c01 100644 --- a/pkg/stanza/operator/output/stdout/stdout.go +++ b/pkg/stanza/operator/output/stdout/stdout.go @@ -62,7 +62,7 @@ func (o *Output) Process(_ context.Context, entry *entry.Entry) error { err := o.encoder.Encode(entry) if err != nil { o.mux.Unlock() - o.Errorf("Failed to process entry: %s, $s", err, entry.Body) + o.Errorf("Failed to process entry: %s", err) return err } o.mux.Unlock() diff --git a/pkg/stanza/operator/parser/jsonarray/json_array_parser.go b/pkg/stanza/operator/parser/jsonarray/json_array_parser.go index 74465559eef6..b28d120205ed 100644 --- a/pkg/stanza/operator/parser/jsonarray/json_array_parser.go +++ b/pkg/stanza/operator/parser/jsonarray/json_array_parser.go @@ -116,7 +116,7 @@ func generateParseToArrayFunc(pool *fastjson.ParserPool) parseFunc { // Nested objects handled as a string since this parser doesn't support nested headers parsedValues[i] = jArray[i].String() default: - return nil, errors.New("failed to parse entry: " + string(jArray[i].MarshalTo(nil))) + return nil, errors.New("failed to parse entry") } } @@ -159,7 +159,7 @@ func generateParseToMapFunc(pool *fastjson.ParserPool, header []string) parseFun // Nested objects handled as a string since this parser doesn't support nested headers parsedValues[header[i]] = jArray[i].String() default: - return nil, errors.New("failed to parse entry: " + string(jArray[i].MarshalTo(nil))) + return nil, errors.New("failed to parse entry") } } From c4ca4f964b7a252ac3cfe3cb783b51a7d879737a Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:27:03 -0700 Subject: [PATCH 10/18] [chore] Update otel (#31020) **Description:** - Handles the `GRPCClientSettings` -> `ClientSettings` breaking change - Handles the `GRPCServerSettings` -> `ServerSettings` breaking change - Handles the `HTTPClientConfig` -> `ClientConfig` change - Handles the `HTTPServerConfig` -> `ServerConfig` change **Link to tracking Issue:** **Testing:** **Documentation:** --------- Signed-off-by: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> --- .../docsgen/testdata/otlp-receiver.json | 4 +- cmd/configschema/go.mod | 70 ++++----- cmd/configschema/go.sum | 140 +++++++++--------- cmd/githubgen/go.mod | 3 +- cmd/githubgen/go.sum | 11 +- cmd/mdatagen/go.mod | 14 +- cmd/mdatagen/go.sum | 28 ++-- cmd/opampsupervisor/go.mod | 7 +- cmd/opampsupervisor/go.sum | 17 ++- cmd/opampsupervisor/specification/README.md | 2 +- cmd/otelcontribcol/builder-config.yaml | 18 +-- cmd/otelcontribcol/exporters_test.go | 8 +- cmd/otelcontribcol/go.mod | 68 ++++----- cmd/otelcontribcol/go.sum | 136 ++++++++--------- cmd/oteltestbedcol/builder-config.yaml | 16 +- cmd/oteltestbedcol/go.mod | 66 ++++----- cmd/oteltestbedcol/go.sum | 132 ++++++++--------- cmd/telemetrygen/go.mod | 10 +- cmd/telemetrygen/go.sum | 20 +-- cmd/telemetrygen/internal/e2etest/go.mod | 38 ++--- cmd/telemetrygen/internal/e2etest/go.sum | 76 +++++----- confmap/provider/s3provider/go.mod | 3 +- confmap/provider/s3provider/go.sum | 11 +- connector/countconnector/go.mod | 14 +- connector/countconnector/go.sum | 28 ++-- connector/datadogconnector/go.mod | 56 +++---- connector/datadogconnector/go.sum | 114 +++++++------- connector/exceptionsconnector/go.mod | 16 +- connector/exceptionsconnector/go.sum | 32 ++-- connector/failoverconnector/go.mod | 14 +- connector/failoverconnector/go.sum | 28 ++-- connector/routingconnector/go.mod | 14 +- connector/routingconnector/go.sum | 28 ++-- connector/servicegraphconnector/go.mod | 30 ++-- connector/servicegraphconnector/go.sum | 60 ++++---- connector/spanmetricsconnector/go.mod | 16 +- connector/spanmetricsconnector/go.sum | 32 ++-- .../alertmanager_exporter.go | 4 +- .../alertmanager_exporter_test.go | 10 +- exporter/alertmanagerexporter/config.go | 10 +- exporter/alertmanagerexporter/config_test.go | 4 +- exporter/alertmanagerexporter/factory.go | 2 +- exporter/alertmanagerexporter/go.mod | 38 ++--- exporter/alertmanagerexporter/go.sum | 76 +++++----- .../alibabacloudlogserviceexporter/go.mod | 24 +-- .../alibabacloudlogserviceexporter/go.sum | 48 +++--- exporter/awscloudwatchlogsexporter/go.mod | 20 +-- exporter/awscloudwatchlogsexporter/go.sum | 40 ++--- exporter/awsemfexporter/go.mod | 24 +-- exporter/awsemfexporter/go.sum | 48 +++--- exporter/awskinesisexporter/go.mod | 20 +-- exporter/awskinesisexporter/go.sum | 42 +++--- exporter/awss3exporter/go.mod | 32 ++-- exporter/awss3exporter/go.sum | 64 ++++---- exporter/awsxrayexporter/go.mod | 24 +-- exporter/awsxrayexporter/go.sum | 48 +++--- exporter/azuredataexplorerexporter/go.mod | 22 +-- exporter/azuredataexplorerexporter/go.sum | 44 +++--- exporter/azuremonitorexporter/go.mod | 24 +-- exporter/azuremonitorexporter/go.sum | 48 +++--- exporter/carbonexporter/go.mod | 26 ++-- exporter/carbonexporter/go.sum | 52 +++---- exporter/cassandraexporter/go.mod | 22 +-- exporter/cassandraexporter/go.sum | 44 +++--- exporter/clickhouseexporter/go.mod | 24 +-- exporter/clickhouseexporter/go.sum | 48 +++--- exporter/coralogixexporter/config.go | 20 +-- exporter/coralogixexporter/config_test.go | 20 +-- exporter/coralogixexporter/factory.go | 10 +- exporter/coralogixexporter/factory_test.go | 20 +-- exporter/coralogixexporter/go.mod | 38 ++--- exporter/coralogixexporter/go.sum | 76 +++++----- exporter/datadogexporter/config.go | 6 +- exporter/datadogexporter/config_test.go | 2 +- exporter/datadogexporter/go.mod | 56 +++---- exporter/datadogexporter/go.sum | 114 +++++++------- .../datadogexporter/integrationtest/go.mod | 56 +++---- .../datadogexporter/integrationtest/go.sum | 114 +++++++------- exporter/datadogexporter/logs_exporter.go | 4 +- exporter/datadogexporter/metrics_exporter.go | 4 +- exporter/datadogexporter/traces_exporter.go | 4 +- exporter/datasetexporter/go.mod | 22 +-- exporter/datasetexporter/go.sum | 44 +++--- exporter/dynatraceexporter/config/config.go | 12 +- .../dynatraceexporter/config/config_test.go | 4 +- exporter/dynatraceexporter/factory.go | 4 +- exporter/dynatraceexporter/factory_test.go | 6 +- exporter/dynatraceexporter/go.mod | 36 ++--- exporter/dynatraceexporter/go.sum | 72 ++++----- .../dynatraceexporter/metrics_exporter.go | 2 +- .../metrics_exporter_test.go | 32 ++-- exporter/elasticsearchexporter/config.go | 14 +- exporter/elasticsearchexporter/config_test.go | 6 +- exporter/elasticsearchexporter/factory.go | 2 +- exporter/elasticsearchexporter/go.mod | 26 ++-- exporter/elasticsearchexporter/go.sum | 52 +++---- exporter/f5cloudexporter/config_test.go | 6 +- exporter/f5cloudexporter/factory.go | 2 +- exporter/f5cloudexporter/factory_test.go | 12 +- exporter/f5cloudexporter/go.mod | 38 ++--- exporter/f5cloudexporter/go.sum | 76 +++++----- exporter/fileexporter/go.mod | 20 +-- exporter/fileexporter/go.sum | 40 ++--- exporter/googlecloudexporter/go.mod | 24 +-- exporter/googlecloudexporter/go.sum | 48 +++--- exporter/googlecloudpubsubexporter/go.mod | 20 +-- exporter/googlecloudpubsubexporter/go.sum | 40 ++--- .../googlemanagedprometheusexporter/go.mod | 32 ++-- .../googlemanagedprometheusexporter/go.sum | 64 ++++---- exporter/honeycombmarkerexporter/config.go | 2 +- exporter/honeycombmarkerexporter/go.mod | 36 ++--- exporter/honeycombmarkerexporter/go.sum | 72 ++++----- .../honeycombmarkerexporter/logs_exporter.go | 4 +- exporter/influxdbexporter/config.go | 2 +- exporter/influxdbexporter/config_test.go | 2 +- exporter/influxdbexporter/factory.go | 2 +- exporter/influxdbexporter/go.mod | 36 ++--- exporter/influxdbexporter/go.sum | 72 ++++----- exporter/influxdbexporter/writer.go | 18 +-- exporter/influxdbexporter/writer_test.go | 2 +- exporter/instanaexporter/config.go | 2 +- exporter/instanaexporter/config_test.go | 2 +- exporter/instanaexporter/exporter.go | 2 +- exporter/instanaexporter/exporter_test.go | 10 +- exporter/instanaexporter/factory.go | 2 +- exporter/instanaexporter/factory_test.go | 8 +- exporter/instanaexporter/go.mod | 38 ++--- exporter/instanaexporter/go.sum | 76 +++++----- exporter/kafkaexporter/go.mod | 26 ++-- exporter/kafkaexporter/go.sum | 52 +++---- exporter/kineticaexporter/go.mod | 22 +-- exporter/kineticaexporter/go.sum | 44 +++--- exporter/loadbalancingexporter/go.mod | 50 +++---- exporter/loadbalancingexporter/go.sum | 100 ++++++------- .../metrics_exporter_test.go | 4 +- .../trace_exporter_test.go | 4 +- exporter/logicmonitorexporter/config.go | 2 +- exporter/logicmonitorexporter/config_test.go | 14 +- exporter/logicmonitorexporter/factory_test.go | 4 +- exporter/logicmonitorexporter/go.mod | 36 ++--- exporter/logicmonitorexporter/go.sum | 72 ++++----- .../logicmonitorexporter/logs_exporter.go | 2 +- .../logs_exporter_test.go | 4 +- .../logicmonitorexporter/traces_exporter.go | 2 +- .../traces_exporter_test.go | 4 +- exporter/logzioexporter/config.go | 4 +- exporter/logzioexporter/config_test.go | 8 +- exporter/logzioexporter/exporter.go | 10 +- exporter/logzioexporter/exporter_test.go | 6 +- exporter/logzioexporter/factory.go | 8 +- exporter/logzioexporter/factory_test.go | 2 +- exporter/logzioexporter/go.mod | 38 ++--- exporter/logzioexporter/go.sum | 76 +++++----- exporter/logzioexporter/jsonlog_test.go | 2 +- exporter/lokiexporter/config.go | 2 +- exporter/lokiexporter/config_test.go | 4 +- exporter/lokiexporter/exporter.go | 6 +- exporter/lokiexporter/exporter_test.go | 4 +- exporter/lokiexporter/factory.go | 2 +- exporter/lokiexporter/factory_test.go | 10 +- exporter/lokiexporter/go.mod | 38 ++--- exporter/lokiexporter/go.sum | 76 +++++----- exporter/mezmoexporter/config.go | 6 +- exporter/mezmoexporter/config_test.go | 2 +- exporter/mezmoexporter/exporter.go | 2 +- exporter/mezmoexporter/factory.go | 8 +- exporter/mezmoexporter/factory_test.go | 2 +- exporter/mezmoexporter/go.mod | 38 ++--- exporter/mezmoexporter/go.sum | 76 +++++----- exporter/opencensusexporter/config.go | 6 +- exporter/opencensusexporter/config_test.go | 2 +- exporter/opencensusexporter/factory.go | 2 +- exporter/opencensusexporter/factory_test.go | 18 +-- exporter/opencensusexporter/go.mod | 40 ++--- exporter/opencensusexporter/go.sum | 80 +++++----- exporter/opencensusexporter/opencensus.go | 4 +- .../opencensusexporter/opencensus_test.go | 16 +- exporter/opensearchexporter/config.go | 2 +- exporter/opensearchexporter/config_test.go | 2 +- exporter/opensearchexporter/factory.go | 2 +- exporter/opensearchexporter/go.mod | 36 ++--- exporter/opensearchexporter/go.sum | 72 ++++----- .../opensearchexporter/sso_log_exporter.go | 4 +- .../opensearchexporter/sso_trace_exporter.go | 4 +- exporter/otelarrowexporter/config.go | 2 +- exporter/otelarrowexporter/config_test.go | 4 +- exporter/otelarrowexporter/factory.go | 2 +- exporter/otelarrowexporter/factory_test.go | 28 ++-- exporter/otelarrowexporter/go.mod | 44 +++--- exporter/otelarrowexporter/go.sum | 88 +++++------ exporter/otelarrowexporter/otelarrow.go | 2 +- exporter/prometheusexporter/README.md | 2 +- exporter/prometheusexporter/config.go | 2 +- exporter/prometheusexporter/config_test.go | 2 +- .../prometheusexporter/end_to_end_test.go | 2 +- exporter/prometheusexporter/go.mod | 38 ++--- exporter/prometheusexporter/go.sum | 86 +++++------ .../prometheusexporter/prometheus_test.go | 14 +- .../prometheusremotewriteexporter/config.go | 2 +- .../config_test.go | 2 +- .../prometheusremotewriteexporter/exporter.go | 6 +- .../exporter_test.go | 26 ++-- .../prometheusremotewriteexporter/factory.go | 2 +- .../factory_test.go | 4 +- exporter/prometheusremotewriteexporter/go.mod | 38 ++--- exporter/prometheusremotewriteexporter/go.sum | 76 +++++----- exporter/pulsarexporter/go.mod | 24 +-- exporter/pulsarexporter/go.sum | 48 +++--- exporter/sapmexporter/go.mod | 24 +-- exporter/sapmexporter/go.sum | 48 +++--- exporter/sentryexporter/go.mod | 22 +-- exporter/sentryexporter/go.sum | 44 +++--- exporter/signalfxexporter/config.go | 4 +- exporter/signalfxexporter/config_test.go | 14 +- exporter/signalfxexporter/exporter.go | 6 +- exporter/signalfxexporter/exporter_test.go | 24 +-- exporter/signalfxexporter/factory.go | 8 +- exporter/signalfxexporter/factory_test.go | 2 +- exporter/signalfxexporter/go.mod | 38 ++--- exporter/signalfxexporter/go.sum | 76 +++++----- .../internal/correlation/config.go | 10 +- .../internal/correlation/config_test.go | 4 +- .../internal/correlation/correlation.go | 4 +- .../internal/correlation/correlation_test.go | 2 +- exporter/skywalkingexporter/config.go | 2 +- exporter/skywalkingexporter/config_test.go | 6 +- exporter/skywalkingexporter/factory.go | 2 +- exporter/skywalkingexporter/factory_test.go | 14 +- exporter/skywalkingexporter/go.mod | 40 ++--- exporter/skywalkingexporter/go.sum | 80 +++++----- exporter/skywalkingexporter/skywalking.go | 4 +- .../skywalking_benchmark_test.go | 2 +- .../skywalkingexporter/skywalking_test.go | 4 +- exporter/splunkhecexporter/client.go | 2 +- exporter/splunkhecexporter/client_test.go | 16 +- exporter/splunkhecexporter/config.go | 6 +- exporter/splunkhecexporter/config_test.go | 16 +- exporter/splunkhecexporter/factory.go | 2 +- exporter/splunkhecexporter/factory_test.go | 12 +- exporter/splunkhecexporter/go.mod | 38 ++--- exporter/splunkhecexporter/go.sum | 76 +++++----- .../splunkhecexporter/integration_test.go | 8 +- exporter/sumologicexporter/config.go | 10 +- exporter/sumologicexporter/config_test.go | 12 +- exporter/sumologicexporter/exporter.go | 2 +- exporter/sumologicexporter/exporter_test.go | 6 +- exporter/sumologicexporter/factory.go | 6 +- exporter/sumologicexporter/factory_test.go | 2 +- exporter/sumologicexporter/go.mod | 36 ++--- exporter/sumologicexporter/go.sum | 72 ++++----- exporter/sumologicexporter/sender.go | 2 +- exporter/sumologicexporter/sender_test.go | 12 +- exporter/syslogexporter/go.mod | 24 +-- exporter/syslogexporter/go.sum | 48 +++--- .../tencentcloudlogserviceexporter/go.mod | 24 +-- .../tencentcloudlogserviceexporter/go.sum | 48 +++--- exporter/zipkinexporter/config.go | 4 +- exporter/zipkinexporter/config_test.go | 2 +- exporter/zipkinexporter/factory.go | 4 +- exporter/zipkinexporter/go.mod | 38 ++--- exporter/zipkinexporter/go.sum | 76 +++++----- exporter/zipkinexporter/zipkin.go | 4 +- exporter/zipkinexporter/zipkin_test.go | 10 +- extension/asapauthextension/go.mod | 14 +- extension/asapauthextension/go.sum | 28 ++-- extension/awsproxy/go.mod | 18 +-- extension/awsproxy/go.sum | 36 ++--- extension/basicauthextension/go.mod | 16 +- extension/basicauthextension/go.sum | 32 ++-- extension/bearertokenauthextension/go.mod | 14 +- extension/bearertokenauthextension/go.sum | 28 ++-- extension/encoding/go.mod | 10 +- extension/encoding/go.sum | 20 +-- .../encoding/jaegerencodingextension/go.mod | 12 +- .../encoding/jaegerencodingextension/go.sum | 24 +-- .../encoding/jsonlogencodingextension/go.mod | 10 +- .../encoding/jsonlogencodingextension/go.sum | 20 +-- .../encoding/otlpencodingextension/go.mod | 10 +- .../encoding/otlpencodingextension/go.sum | 20 +-- .../encoding/textencodingextension/go.mod | 10 +- .../encoding/textencodingextension/go.sum | 20 +-- .../encoding/zipkinencodingextension/go.mod | 12 +- .../encoding/zipkinencodingextension/go.sum | 24 +-- extension/headerssetterextension/go.mod | 14 +- extension/headerssetterextension/go.sum | 28 ++-- extension/healthcheckextension/README.md | 2 +- extension/healthcheckextension/config.go | 2 +- extension/healthcheckextension/config_test.go | 2 +- extension/healthcheckextension/factory.go | 2 +- .../healthcheckextension/factory_test.go | 2 +- extension/healthcheckextension/go.mod | 30 ++-- extension/healthcheckextension/go.sum | 60 ++++---- .../healthcheckextension_test.go | 24 +-- extension/httpforwarder/config.go | 4 +- extension/httpforwarder/config_test.go | 4 +- extension/httpforwarder/extension_test.go | 18 +-- extension/httpforwarder/factory.go | 4 +- extension/httpforwarder/factory_test.go | 4 +- extension/httpforwarder/go.mod | 28 ++-- extension/httpforwarder/go.sum | 56 +++---- extension/jaegerremotesampling/config.go | 8 +- extension/jaegerremotesampling/config_test.go | 16 +- extension/jaegerremotesampling/extension.go | 4 +- .../jaegerremotesampling/extension_test.go | 6 +- extension/jaegerremotesampling/factory.go | 4 +- .../jaegerremotesampling/factory_test.go | 4 +- extension/jaegerremotesampling/go.mod | 32 ++-- extension/jaegerremotesampling/go.sum | 64 ++++---- .../jaegerremotesampling/internal/grpc.go | 4 +- .../internal/grpc_test.go | 4 +- .../jaegerremotesampling/internal/http.go | 4 +- .../internal/http_test.go | 10 +- .../internal/remote_strategy_store.go | 2 +- .../extension_test.go | 2 +- extension/oauth2clientauthextension/go.mod | 28 ++-- extension/oauth2clientauthextension/go.sum | 56 +++---- extension/observer/dockerobserver/go.mod | 10 +- extension/observer/dockerobserver/go.sum | 20 +-- extension/observer/ecsobserver/go.mod | 10 +- extension/observer/ecsobserver/go.sum | 20 +-- extension/observer/ecstaskobserver/config.go | 2 +- .../observer/ecstaskobserver/config_test.go | 2 +- extension/observer/ecstaskobserver/factory.go | 2 +- extension/observer/ecstaskobserver/go.mod | 28 ++-- extension/observer/ecstaskobserver/go.sum | 56 +++---- extension/observer/hostobserver/go.mod | 10 +- extension/observer/hostobserver/go.sum | 20 +-- extension/observer/k8sobserver/go.mod | 10 +- extension/observer/k8sobserver/go.sum | 20 +-- extension/oidcauthextension/go.mod | 14 +- extension/oidcauthextension/go.sum | 28 ++-- extension/opampextension/go.mod | 16 +- extension/opampextension/go.sum | 32 ++-- extension/pprofextension/go.mod | 14 +- extension/pprofextension/go.sum | 28 ++-- extension/remotetapextension/config.go | 4 +- extension/remotetapextension/extension.go | 2 +- extension/remotetapextension/go.mod | 28 ++-- extension/remotetapextension/go.sum | 56 +++---- extension/sigv4authextension/go.mod | 12 +- extension/sigv4authextension/go.sum | 24 +-- .../solarwindsapmsettingsextension/go.mod | 10 +- .../solarwindsapmsettingsextension/go.sum | 20 +-- extension/storage/go.mod | 12 +- extension/storage/go.sum | 24 +-- extension/sumologicextension/go.mod | 28 ++-- extension/sumologicextension/go.sum | 56 +++---- go.mod | 70 ++++----- go.sum | 140 +++++++++--------- internal/aws/containerinsight/go.mod | 2 +- internal/aws/containerinsight/go.sum | 4 +- internal/aws/cwlogs/go.mod | 8 +- internal/aws/cwlogs/go.sum | 16 +- internal/aws/ecsutil/client.go | 6 +- internal/aws/ecsutil/client_test.go | 4 +- internal/aws/ecsutil/go.mod | 28 ++-- internal/aws/ecsutil/go.sum | 56 +++---- internal/aws/ecsutil/metadata_provider.go | 2 +- internal/aws/ecsutil/rest_client.go | 2 +- internal/aws/ecsutil/rest_client_test.go | 2 +- internal/aws/proxy/go.mod | 8 +- internal/aws/proxy/go.sum | 23 ++- internal/aws/xray/go.mod | 8 +- internal/aws/xray/go.sum | 16 +- internal/common/go.mod | 2 +- internal/common/go.sum | 4 +- internal/coreinternal/go.mod | 18 +-- internal/coreinternal/go.sum | 36 ++--- internal/datadog/go.mod | 12 +- internal/datadog/go.sum | 24 +-- internal/filter/go.mod | 12 +- internal/filter/go.sum | 24 +-- internal/kafka/go.mod | 5 +- internal/kafka/go.sum | 18 ++- internal/kubelet/go.mod | 4 +- internal/kubelet/go.sum | 17 ++- internal/metadataproviders/go.mod | 2 +- internal/metadataproviders/go.sum | 4 +- internal/sharedcomponent/go.mod | 8 +- internal/sharedcomponent/go.sum | 16 +- internal/splunk/go.mod | 20 +-- internal/splunk/go.sum | 40 ++--- internal/sqlquery/go.mod | 14 +- internal/sqlquery/go.sum | 28 ++-- internal/tools/go.mod | 2 +- internal/tools/go.sum | 4 +- pkg/batchperresourceattr/go.mod | 4 +- pkg/batchperresourceattr/go.sum | 8 +- pkg/batchpersignal/go.mod | 2 +- pkg/batchpersignal/go.sum | 4 +- pkg/experimentalmetricmetadata/go.mod | 2 +- pkg/experimentalmetricmetadata/go.sum | 4 +- pkg/golden/go.mod | 2 +- pkg/golden/go.sum | 4 +- pkg/ottl/go.mod | 8 +- pkg/ottl/go.sum | 16 +- pkg/pdatatest/go.mod | 2 +- pkg/pdatatest/go.sum | 4 +- pkg/pdatautil/go.mod | 2 +- pkg/pdatautil/go.sum | 4 +- pkg/resourcetotelemetry/go.mod | 12 +- pkg/resourcetotelemetry/go.sum | 24 +-- pkg/sampling/go.mod | 2 +- pkg/sampling/go.sum | 4 +- pkg/stanza/go.mod | 22 +-- pkg/stanza/go.sum | 44 +++--- pkg/translator/azure/go.mod | 10 +- pkg/translator/azure/go.sum | 20 +-- pkg/translator/jaeger/go.mod | 4 +- pkg/translator/jaeger/go.sum | 8 +- pkg/translator/loki/go.mod | 6 +- pkg/translator/loki/go.sum | 12 +- pkg/translator/opencensus/go.mod | 4 +- pkg/translator/opencensus/go.sum | 8 +- pkg/translator/prometheus/go.mod | 4 +- pkg/translator/prometheus/go.sum | 8 +- pkg/translator/prometheusremotewrite/go.mod | 6 +- pkg/translator/prometheusremotewrite/go.sum | 12 +- pkg/translator/signalfx/go.mod | 2 +- pkg/translator/signalfx/go.sum | 4 +- pkg/translator/skywalking/go.mod | 4 +- pkg/translator/skywalking/go.sum | 8 +- pkg/translator/zipkin/go.mod | 4 +- pkg/translator/zipkin/go.sum | 8 +- processor/attributesprocessor/go.mod | 18 +-- processor/attributesprocessor/go.sum | 36 ++--- processor/cumulativetodeltaprocessor/go.mod | 14 +- processor/cumulativetodeltaprocessor/go.sum | 28 ++-- processor/datadogprocessor/go.mod | 22 +-- processor/datadogprocessor/go.sum | 44 +++--- processor/deltatocumulativeprocessor/go.mod | 12 +- processor/deltatocumulativeprocessor/go.sum | 24 +-- processor/deltatorateprocessor/go.mod | 14 +- processor/deltatorateprocessor/go.sum | 28 ++-- processor/filterprocessor/go.mod | 18 +-- processor/filterprocessor/go.sum | 36 ++--- processor/groupbyattrsprocessor/go.mod | 14 +- processor/groupbyattrsprocessor/go.sum | 28 ++-- processor/groupbytraceprocessor/go.mod | 14 +- processor/groupbytraceprocessor/go.sum | 28 ++-- processor/intervalprocessor/go.mod | 14 +- processor/intervalprocessor/go.sum | 28 ++-- processor/k8sattributesprocessor/go.mod | 42 +++--- processor/k8sattributesprocessor/go.sum | 84 +++++------ processor/logstransformprocessor/go.mod | 20 +-- processor/logstransformprocessor/go.sum | 40 ++--- processor/metricsgenerationprocessor/go.mod | 14 +- processor/metricsgenerationprocessor/go.sum | 28 ++-- processor/metricstransformprocessor/go.mod | 14 +- processor/metricstransformprocessor/go.sum | 28 ++-- .../probabilisticsamplerprocessor/go.mod | 30 ++-- .../probabilisticsamplerprocessor/go.sum | 60 ++++---- processor/redactionprocessor/go.mod | 14 +- processor/redactionprocessor/go.sum | 28 ++-- processor/remotetapprocessor/config.go | 4 +- processor/remotetapprocessor/go.mod | 32 ++-- processor/remotetapprocessor/go.sum | 64 ++++---- processor/remotetapprocessor/processor.go | 4 +- processor/remotetapprocessor/server_test.go | 6 +- .../resourcedetectionprocessor/config.go | 2 +- .../resourcedetectionprocessor/config_test.go | 60 ++++---- .../resourcedetectionprocessor/factory.go | 18 +-- processor/resourcedetectionprocessor/go.mod | 34 ++--- processor/resourcedetectionprocessor/go.sum | 68 ++++----- .../internal/aws/ec2/ec2.go | 4 +- .../resourcedetection_processor.go | 2 +- .../resourcedetection_processor_test.go | 6 +- processor/resourceprocessor/go.mod | 16 +- processor/resourceprocessor/go.sum | 32 ++-- processor/routingprocessor/factory_test.go | 2 +- processor/routingprocessor/go.mod | 42 +++--- processor/routingprocessor/go.sum | 84 +++++------ processor/routingprocessor/traces_test.go | 2 +- processor/schemaprocessor/config.go | 2 +- processor/schemaprocessor/config_test.go | 2 +- processor/schemaprocessor/factory.go | 2 +- processor/schemaprocessor/go.mod | 32 ++-- processor/schemaprocessor/go.sum | 64 ++++---- processor/spanmetricsprocessor/go.mod | 44 +++--- processor/spanmetricsprocessor/go.sum | 88 +++++------ .../spanmetricsprocessor/processor_test.go | 2 +- processor/spanprocessor/go.mod | 18 +-- processor/spanprocessor/go.sum | 36 ++--- processor/sumologicprocessor/go.mod | 30 ++-- processor/sumologicprocessor/go.sum | 60 ++++---- processor/tailsamplingprocessor/go.mod | 14 +- processor/tailsamplingprocessor/go.sum | 28 ++-- processor/transformprocessor/go.mod | 16 +- processor/transformprocessor/go.sum | 32 ++-- receiver/activedirectorydsreceiver/go.mod | 14 +- receiver/activedirectorydsreceiver/go.sum | 28 ++-- receiver/aerospikereceiver/go.mod | 18 +-- receiver/aerospikereceiver/go.sum | 36 ++--- receiver/apachereceiver/config.go | 2 +- receiver/apachereceiver/factory.go | 2 +- receiver/apachereceiver/go.mod | 32 ++-- receiver/apachereceiver/go.sum | 64 ++++---- receiver/apachereceiver/scraper_test.go | 2 +- receiver/apachesparkreceiver/client_test.go | 2 +- receiver/apachesparkreceiver/config.go | 2 +- receiver/apachesparkreceiver/config_test.go | 2 +- receiver/apachesparkreceiver/factory.go | 2 +- receiver/apachesparkreceiver/factory_test.go | 2 +- receiver/apachesparkreceiver/go.mod | 32 ++-- receiver/apachesparkreceiver/go.sum | 64 ++++---- receiver/apachesparkreceiver/scraper_test.go | 4 +- receiver/awscloudwatchmetricsreceiver/go.mod | 12 +- receiver/awscloudwatchmetricsreceiver/go.sum | 24 +-- receiver/awscloudwatchreceiver/go.mod | 12 +- receiver/awscloudwatchreceiver/go.sum | 24 +-- receiver/awscontainerinsightreceiver/go.mod | 32 ++-- receiver/awscontainerinsightreceiver/go.sum | 64 ++++---- .../internal/ecsInfo/ecsinfo.go | 2 +- .../awsecscontainermetricsreceiver/factory.go | 2 +- .../awsecscontainermetricsreceiver/go.mod | 34 ++--- .../awsecscontainermetricsreceiver/go.sum | 68 ++++----- receiver/awsfirehosereceiver/config.go | 4 +- receiver/awsfirehosereceiver/config_test.go | 2 +- receiver/awsfirehosereceiver/factory.go | 2 +- receiver/awsfirehosereceiver/go.mod | 34 ++--- receiver/awsfirehosereceiver/go.sum | 68 ++++----- receiver/awsfirehosereceiver/receiver.go | 4 +- receiver/awsfirehosereceiver/receiver_test.go | 2 +- receiver/awsxrayreceiver/go.mod | 24 +-- receiver/awsxrayreceiver/go.sum | 48 +++--- receiver/azureblobreceiver/go.mod | 30 ++-- receiver/azureblobreceiver/go.sum | 60 ++++---- receiver/azureeventhubreceiver/go.mod | 30 ++-- receiver/azureeventhubreceiver/go.sum | 60 ++++---- receiver/azuremonitorreceiver/go.mod | 14 +- receiver/azuremonitorreceiver/go.sum | 28 ++-- receiver/bigipreceiver/client_test.go | 4 +- receiver/bigipreceiver/config.go | 2 +- receiver/bigipreceiver/config_test.go | 10 +- receiver/bigipreceiver/factory.go | 2 +- receiver/bigipreceiver/factory_test.go | 2 +- receiver/bigipreceiver/go.mod | 32 ++-- receiver/bigipreceiver/go.sum | 64 ++++---- receiver/bigipreceiver/scraper_test.go | 4 +- receiver/carbonreceiver/go.mod | 18 +-- receiver/carbonreceiver/go.sum | 36 ++--- receiver/chronyreceiver/go.mod | 14 +- receiver/chronyreceiver/go.sum | 28 ++-- receiver/cloudflarereceiver/go.mod | 18 +-- receiver/cloudflarereceiver/go.sum | 36 ++--- receiver/cloudfoundryreceiver/config.go | 16 +- receiver/cloudfoundryreceiver/config_test.go | 14 +- receiver/cloudfoundryreceiver/factory.go | 4 +- receiver/cloudfoundryreceiver/go.mod | 32 ++-- receiver/cloudfoundryreceiver/go.sum | 64 ++++---- receiver/cloudfoundryreceiver/receiver.go | 4 +- receiver/cloudfoundryreceiver/stream.go | 2 +- receiver/cloudfoundryreceiver/stream_test.go | 8 +- receiver/cloudfoundryreceiver/uaa.go | 2 +- receiver/cloudfoundryreceiver/uaa_test.go | 8 +- receiver/collectdreceiver/config.go | 8 +- receiver/collectdreceiver/config_test.go | 2 +- receiver/collectdreceiver/factory.go | 2 +- receiver/collectdreceiver/go.mod | 32 ++-- receiver/collectdreceiver/go.sum | 64 ++++---- receiver/collectdreceiver/receiver.go | 4 +- receiver/collectdreceiver/receiver_test.go | 8 +- receiver/couchdbreceiver/client_test.go | 8 +- receiver/couchdbreceiver/config.go | 2 +- receiver/couchdbreceiver/config_test.go | 10 +- receiver/couchdbreceiver/factory.go | 2 +- receiver/couchdbreceiver/go.mod | 32 ++-- receiver/couchdbreceiver/go.sum | 64 ++++---- receiver/couchdbreceiver/scraper_test.go | 4 +- receiver/datadogreceiver/config.go | 2 +- receiver/datadogreceiver/factory.go | 2 +- receiver/datadogreceiver/go.mod | 34 ++--- receiver/datadogreceiver/go.sum | 68 ++++----- receiver/datadogreceiver/receiver.go | 4 +- receiver/dockerstatsreceiver/go.mod | 18 +-- receiver/dockerstatsreceiver/go.sum | 36 ++--- receiver/elasticsearchreceiver/client.go | 2 +- receiver/elasticsearchreceiver/client_test.go | 56 +++---- receiver/elasticsearchreceiver/config.go | 2 +- receiver/elasticsearchreceiver/config_test.go | 2 +- receiver/elasticsearchreceiver/factory.go | 2 +- receiver/elasticsearchreceiver/go.mod | 32 ++-- receiver/elasticsearchreceiver/go.sum | 64 ++++---- .../elasticsearchreceiver/scraper_test.go | 2 +- receiver/expvarreceiver/config.go | 2 +- receiver/expvarreceiver/config_test.go | 2 +- receiver/expvarreceiver/factory.go | 2 +- receiver/expvarreceiver/factory_test.go | 2 +- receiver/expvarreceiver/go.mod | 32 ++-- receiver/expvarreceiver/go.sum | 64 ++++---- receiver/expvarreceiver/scraper.go | 2 +- receiver/filelogreceiver/go.mod | 18 +-- receiver/filelogreceiver/go.sum | 36 ++--- receiver/filereceiver/go.mod | 12 +- receiver/filereceiver/go.sum | 24 +-- receiver/filestatsreceiver/go.mod | 14 +- receiver/filestatsreceiver/go.sum | 28 ++-- receiver/flinkmetricsreceiver/client_test.go | 4 +- receiver/flinkmetricsreceiver/config.go | 2 +- receiver/flinkmetricsreceiver/config_test.go | 4 +- receiver/flinkmetricsreceiver/factory.go | 2 +- receiver/flinkmetricsreceiver/factory_test.go | 2 +- receiver/flinkmetricsreceiver/go.mod | 32 ++-- receiver/flinkmetricsreceiver/go.sum | 64 ++++---- receiver/flinkmetricsreceiver/scraper_test.go | 4 +- receiver/fluentforwardreceiver/go.mod | 14 +- receiver/fluentforwardreceiver/go.sum | 28 ++-- receiver/gitproviderreceiver/go.mod | 44 +++--- receiver/gitproviderreceiver/go.sum | 88 +++++------ .../internal/scraper/githubscraper/config.go | 2 +- .../scraper/githubscraper/config_test.go | 2 +- .../internal/scraper/githubscraper/factory.go | 2 +- .../internal/scraper/githubscraper/helpers.go | 8 +- receiver/googlecloudpubsubreceiver/go.mod | 20 +-- receiver/googlecloudpubsubreceiver/go.sum | 40 ++--- receiver/googlecloudspannerreceiver/go.mod | 14 +- receiver/googlecloudspannerreceiver/go.sum | 28 ++-- receiver/haproxyreceiver/config.go | 4 +- receiver/haproxyreceiver/go.mod | 32 ++-- receiver/haproxyreceiver/go.sum | 64 ++++---- receiver/haproxyreceiver/scraper.go | 2 +- receiver/hostmetricsreceiver/go.mod | 30 ++-- receiver/hostmetricsreceiver/go.sum | 60 ++++---- receiver/httpcheckreceiver/config.go | 4 +- receiver/httpcheckreceiver/config_test.go | 14 +- receiver/httpcheckreceiver/go.mod | 32 ++-- receiver/httpcheckreceiver/go.sum | 64 ++++---- receiver/httpcheckreceiver/scraper_test.go | 12 +- receiver/iisreceiver/go.mod | 14 +- receiver/iisreceiver/go.sum | 28 ++-- receiver/influxdbreceiver/config.go | 2 +- receiver/influxdbreceiver/factory.go | 2 +- receiver/influxdbreceiver/go.mod | 34 ++--- receiver/influxdbreceiver/go.sum | 68 ++++----- receiver/influxdbreceiver/receiver.go | 4 +- receiver/influxdbreceiver/receiver_test.go | 2 +- receiver/jaegerreceiver/config.go | 16 +- receiver/jaegerreceiver/config_test.go | 18 +-- receiver/jaegerreceiver/factory.go | 8 +- receiver/jaegerreceiver/factory_test.go | 12 +- receiver/jaegerreceiver/go.mod | 38 ++--- receiver/jaegerreceiver/go.sum | 76 +++++----- receiver/jaegerreceiver/trace_receiver.go | 20 +-- .../jaegerreceiver/trace_receiver_test.go | 14 +- receiver/jmxreceiver/go.mod | 42 +++--- receiver/jmxreceiver/go.sum | 84 +++++------ receiver/journaldreceiver/go.mod | 18 +-- receiver/journaldreceiver/go.sum | 36 ++--- receiver/k8sclusterreceiver/go.mod | 40 ++--- receiver/k8sclusterreceiver/go.sum | 80 +++++----- receiver/k8seventsreceiver/go.mod | 16 +- receiver/k8seventsreceiver/go.sum | 32 ++-- receiver/k8sobjectsreceiver/go.mod | 40 ++--- receiver/k8sobjectsreceiver/go.sum | 80 +++++----- receiver/kafkametricsreceiver/go.mod | 18 +-- receiver/kafkametricsreceiver/go.sum | 36 ++--- receiver/kafkareceiver/go.mod | 26 ++-- receiver/kafkareceiver/go.sum | 52 +++---- receiver/kubeletstatsreceiver/go.mod | 40 ++--- receiver/kubeletstatsreceiver/go.sum | 80 +++++----- receiver/lokireceiver/config.go | 4 +- receiver/lokireceiver/config_test.go | 8 +- receiver/lokireceiver/factory.go | 4 +- receiver/lokireceiver/factory_test.go | 2 +- receiver/lokireceiver/go.mod | 38 ++--- receiver/lokireceiver/go.sum | 76 +++++----- receiver/lokireceiver/loki_test.go | 4 +- receiver/memcachedreceiver/go.mod | 16 +- receiver/memcachedreceiver/go.sum | 32 ++-- receiver/mongodbatlasreceiver/go.mod | 24 +-- receiver/mongodbatlasreceiver/go.sum | 48 +++--- receiver/mongodbreceiver/go.mod | 22 +-- receiver/mongodbreceiver/go.sum | 44 +++--- receiver/mysqlreceiver/go.mod | 20 +-- receiver/mysqlreceiver/go.sum | 40 ++--- receiver/namedpipereceiver/go.mod | 18 +-- receiver/namedpipereceiver/go.sum | 36 ++--- receiver/nginxreceiver/config.go | 2 +- receiver/nginxreceiver/factory.go | 2 +- receiver/nginxreceiver/go.mod | 32 ++-- receiver/nginxreceiver/go.sum | 64 ++++---- receiver/nginxreceiver/scraper.go | 2 +- receiver/nginxreceiver/scraper_test.go | 6 +- receiver/nsxtreceiver/client.go | 2 +- receiver/nsxtreceiver/client_test.go | 32 ++-- receiver/nsxtreceiver/config.go | 2 +- receiver/nsxtreceiver/config_test.go | 8 +- receiver/nsxtreceiver/go.mod | 32 ++-- receiver/nsxtreceiver/go.sum | 64 ++++---- receiver/nsxtreceiver/scraper_test.go | 6 +- receiver/opencensusreceiver/config.go | 4 +- receiver/opencensusreceiver/config_test.go | 12 +- receiver/opencensusreceiver/factory.go | 2 +- receiver/opencensusreceiver/factory_test.go | 16 +- receiver/opencensusreceiver/go.mod | 36 ++--- receiver/opencensusreceiver/go.sum | 72 ++++----- receiver/opencensusreceiver/opencensus.go | 2 +- .../opencensusreceiver/opencensus_test.go | 2 +- receiver/opencensusreceiver/options.go | 6 +- receiver/oracledbreceiver/go.mod | 14 +- receiver/oracledbreceiver/go.sum | 28 ++-- receiver/osqueryreceiver/go.mod | 14 +- receiver/osqueryreceiver/go.sum | 28 ++-- receiver/otlpjsonfilereceiver/go.mod | 18 +-- receiver/otlpjsonfilereceiver/go.sum | 36 ++--- receiver/podmanreceiver/go.mod | 18 +-- receiver/podmanreceiver/go.sum | 36 ++--- receiver/postgresqlreceiver/go.mod | 22 +-- receiver/postgresqlreceiver/go.sum | 44 +++--- receiver/prometheusreceiver/go.mod | 48 +++--- receiver/prometheusreceiver/go.sum | 96 ++++++------ receiver/pulsarreceiver/go.mod | 16 +- receiver/pulsarreceiver/go.sum | 34 ++--- receiver/purefareceiver/config.go | 2 +- receiver/purefareceiver/factory.go | 4 +- receiver/purefareceiver/go.mod | 34 ++--- receiver/purefareceiver/go.sum | 82 +++++----- receiver/purefbreceiver/config.go | 2 +- receiver/purefbreceiver/factory.go | 2 +- receiver/purefbreceiver/go.mod | 34 ++--- receiver/purefbreceiver/go.sum | 82 +++++----- receiver/rabbitmqreceiver/client_test.go | 4 +- receiver/rabbitmqreceiver/config.go | 2 +- receiver/rabbitmqreceiver/config_test.go | 10 +- receiver/rabbitmqreceiver/factory.go | 2 +- receiver/rabbitmqreceiver/factory_test.go | 2 +- receiver/rabbitmqreceiver/go.mod | 32 ++-- receiver/rabbitmqreceiver/go.sum | 64 ++++---- receiver/rabbitmqreceiver/scraper_test.go | 4 +- receiver/receivercreator/go.mod | 30 ++-- receiver/receivercreator/go.sum | 60 ++++---- receiver/redisreceiver/go.mod | 20 +-- receiver/redisreceiver/go.sum | 40 ++--- receiver/riakreceiver/client_test.go | 4 +- receiver/riakreceiver/config.go | 2 +- receiver/riakreceiver/config_test.go | 10 +- receiver/riakreceiver/factory.go | 2 +- receiver/riakreceiver/factory_test.go | 2 +- receiver/riakreceiver/go.mod | 32 ++-- receiver/riakreceiver/go.sum | 64 ++++---- receiver/riakreceiver/scraper_test.go | 4 +- receiver/saphanareceiver/go.mod | 20 +-- receiver/saphanareceiver/go.sum | 40 ++--- receiver/sapmreceiver/config.go | 2 +- receiver/sapmreceiver/config_test.go | 6 +- receiver/sapmreceiver/factory.go | 2 +- receiver/sapmreceiver/go.mod | 38 ++--- receiver/sapmreceiver/go.sum | 76 +++++----- receiver/sapmreceiver/trace_receiver.go | 4 +- receiver/sapmreceiver/trace_receiver_test.go | 8 +- receiver/signalfxreceiver/config.go | 6 +- receiver/signalfxreceiver/config_test.go | 4 +- receiver/signalfxreceiver/factory.go | 2 +- receiver/signalfxreceiver/go.mod | 38 ++--- receiver/signalfxreceiver/go.sum | 76 +++++----- receiver/signalfxreceiver/receiver.go | 4 +- receiver/signalfxreceiver/receiver_test.go | 4 +- receiver/simpleprometheusreceiver/config.go | 4 +- .../simpleprometheusreceiver/config_test.go | 6 +- receiver/simpleprometheusreceiver/factory.go | 2 +- receiver/simpleprometheusreceiver/go.mod | 34 ++--- receiver/simpleprometheusreceiver/go.sum | 82 +++++----- receiver/simpleprometheusreceiver/receiver.go | 2 +- .../simpleprometheusreceiver/receiver_test.go | 14 +- receiver/skywalkingreceiver/config.go | 4 +- receiver/skywalkingreceiver/config_test.go | 4 +- receiver/skywalkingreceiver/factory.go | 4 +- receiver/skywalkingreceiver/factory_test.go | 10 +- receiver/skywalkingreceiver/go.mod | 38 ++--- receiver/skywalkingreceiver/go.sum | 76 +++++----- .../skywalkingreceiver/skywalking_receiver.go | 4 +- .../skywalking_receiver_test.go | 4 +- receiver/snmpreceiver/go.mod | 32 ++-- receiver/snmpreceiver/go.sum | 64 ++++---- receiver/snowflakereceiver/go.mod | 16 +- receiver/snowflakereceiver/go.sum | 32 ++-- receiver/solacereceiver/go.mod | 16 +- receiver/solacereceiver/go.sum | 32 ++-- receiver/splunkenterprisereceiver/client.go | 2 +- .../splunkenterprisereceiver/client_test.go | 6 +- receiver/splunkenterprisereceiver/config.go | 4 +- receiver/splunkenterprisereceiver/factory.go | 4 +- .../splunkenterprisereceiver/factory_test.go | 4 +- receiver/splunkenterprisereceiver/go.mod | 32 ++-- receiver/splunkenterprisereceiver/go.sum | 64 ++++---- .../splunkenterprisereceiver/scraper_test.go | 2 +- receiver/splunkhecreceiver/config.go | 2 +- receiver/splunkhecreceiver/config_test.go | 4 +- receiver/splunkhecreceiver/factory.go | 2 +- receiver/splunkhecreceiver/go.mod | 38 ++--- receiver/splunkhecreceiver/go.sum | 76 +++++----- receiver/splunkhecreceiver/receiver.go | 4 +- receiver/splunkhecreceiver/receiver_test.go | 4 +- receiver/sqlqueryreceiver/go.mod | 18 +-- receiver/sqlqueryreceiver/go.sum | 36 ++--- receiver/sqlserverreceiver/go.mod | 14 +- receiver/sqlserverreceiver/go.sum | 28 ++-- receiver/sshcheckreceiver/go.mod | 18 +-- receiver/sshcheckreceiver/go.sum | 36 ++--- receiver/statsdreceiver/go.mod | 18 +-- receiver/statsdreceiver/go.sum | 38 ++--- receiver/syslogreceiver/go.mod | 22 +-- receiver/syslogreceiver/go.sum | 44 +++--- receiver/tcplogreceiver/go.mod | 22 +-- receiver/tcplogreceiver/go.sum | 44 +++--- receiver/udplogreceiver/go.mod | 18 +-- receiver/udplogreceiver/go.sum | 36 ++--- receiver/vcenterreceiver/go.mod | 20 +-- receiver/vcenterreceiver/go.sum | 40 ++--- receiver/wavefrontreceiver/go.mod | 18 +-- receiver/wavefrontreceiver/go.sum | 36 ++--- receiver/webhookeventreceiver/config.go | 14 +- receiver/webhookeventreceiver/config_test.go | 14 +- receiver/webhookeventreceiver/go.mod | 32 ++-- receiver/webhookeventreceiver/go.sum | 64 ++++---- receiver/webhookeventreceiver/receiver.go | 4 +- .../webhookeventreceiver/receiver_test.go | 2 +- receiver/windowseventlogreceiver/go.mod | 18 +-- receiver/windowseventlogreceiver/go.sum | 36 ++--- receiver/windowsperfcountersreceiver/go.mod | 14 +- receiver/windowsperfcountersreceiver/go.sum | 28 ++-- receiver/zipkinreceiver/config.go | 2 +- receiver/zipkinreceiver/config_test.go | 4 +- receiver/zipkinreceiver/factory.go | 2 +- receiver/zipkinreceiver/go.mod | 34 ++--- receiver/zipkinreceiver/go.sum | 68 ++++----- receiver/zipkinreceiver/trace_receiver.go | 4 +- .../zipkinreceiver/trace_receiver_test.go | 18 +-- receiver/zookeeperreceiver/go.mod | 18 +-- receiver/zookeeperreceiver/go.sum | 36 ++--- testbed/datareceivers/jaeger.go | 2 +- testbed/datareceivers/sapm.go | 2 +- testbed/datareceivers/signalfx.go | 2 +- testbed/datareceivers/splunk.go | 2 +- testbed/datasenders/jaeger.go | 6 +- testbed/go.mod | 66 ++++----- testbed/go.sum | 132 ++++++++--------- .../mockdatadogagentexporter/config.go | 2 +- .../mockdatadogagentexporter/factory.go | 2 +- .../mockdatadogagentexporter/go.mod | 34 ++--- .../mockdatadogagentexporter/go.sum | 68 ++++----- .../traces_exporter.go | 4 +- 842 files changed, 9696 insertions(+), 9673 deletions(-) diff --git a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json index 5c51c70bd50d..c1a1f0a71b07 100644 --- a/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json +++ b/cmd/configschema/docsgen/docsgen/testdata/otlp-receiver.json @@ -14,7 +14,7 @@ "Fields": [ { "Name": "grpc", - "Type": "*configgrpc.GRPCServerSettings", + "Type": "*configgrpc.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "", @@ -261,7 +261,7 @@ }, { "Name": "http", - "Type": "*confighttp.HTTPServerConfig", + "Type": "*confighttp.ServerConfig", "Kind": "ptr", "Default": null, "Doc": "", diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index df5367a2ba62..b280f8bcd0ea 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -10,10 +10,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 golang.org/x/mod v0.14.0 golang.org/x/text v0.14.0 @@ -173,8 +173,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect ) require ( @@ -621,35 +621,35 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index dc0b2c1b3433..e24e4f1883a6 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1569,76 +1569,76 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f h1:wQcpS+Mm42oaYDZ2YqqNc/bmxzeHUD2KzL7Vgx7pDj0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d h1:eONwZYONNf2uu7zSbv8PurEP+f+Cf/fWPx3gEw5zOVM= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/githubgen/go.mod b/cmd/githubgen/go.mod index 346c22c9aa00..66e9342939b5 100644 --- a/cmd/githubgen/go.mod +++ b/cmd/githubgen/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/google/go-github/v58 v58.0.0 - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d gopkg.in/yaml.v3 v3.0.1 ) @@ -13,7 +13,6 @@ 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.0.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/cmd/githubgen/go.sum b/cmd/githubgen/go.sum index 243e460c8873..e91057f20c22 100644 --- a/cmd/githubgen/go.sum +++ b/cmd/githubgen/go.sum @@ -1,4 +1,3 @@ -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= @@ -12,9 +11,6 @@ github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPgh github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -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/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= @@ -22,15 +18,14 @@ github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= 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/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 961e447c5082..87943120644c 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -6,11 +6,11 @@ go 1.20 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum index ea0530cbfca5..b1a5d052d542 100644 --- a/cmd/mdatagen/go.sum +++ b/cmd/mdatagen/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/cmd/opampsupervisor/go.mod b/cmd/opampsupervisor/go.mod index ff63d0d881d1..3ac8404e3490 100644 --- a/cmd/opampsupervisor/go.mod +++ b/cmd/opampsupervisor/go.mod @@ -11,8 +11,8 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -27,7 +27,8 @@ require ( github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/sys v0.16.0 // indirect diff --git a/cmd/opampsupervisor/go.sum b/cmd/opampsupervisor/go.sum index 2813d1132bcd..ae138c0a2e08 100644 --- a/cmd/opampsupervisor/go.sum +++ b/cmd/opampsupervisor/go.sum @@ -8,10 +8,12 @@ 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/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY= github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= 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/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP1XFUxVI5w= github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c= github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA= github.com/knadh/koanf/providers/rawbytes v0.1.0 h1:dpzgu2KO6uf6oCb4aP05KDmKmAmI51k5pe8RYKQ0qME= @@ -36,12 +38,15 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= 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= diff --git a/cmd/opampsupervisor/specification/README.md b/cmd/opampsupervisor/specification/README.md index c842a86bef32..0fef754e446a 100644 --- a/cmd/opampsupervisor/specification/README.md +++ b/cmd/opampsupervisor/specification/README.md @@ -411,7 +411,7 @@ extensions: opamp: # OpAMP server URL. Supports WS or plain http transport, # based on the scheme of the URL (ws,wss,http,https). - # Any other settings defined in HTTPClientConfig, squashed. This + # Any other settings defined in ClientConfig, squashed. This # includes ability to specify an "auth" setting that refers # to an extension that implements the Authentication interface. endpoint: diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 3f79cf1a0ca5..c30b5ebec243 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -6,8 +6,8 @@ dist: otelcol_version: 0.93.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/asapauthextension v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.93.0 @@ -44,9 +44,9 @@ extensions: import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.93.0 @@ -94,8 +94,8 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240129215828-1ed45ec12569 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor v0.93.0 @@ -120,7 +120,7 @@ processors: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.93.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240129215828-1ed45ec12569 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/aerospikereceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver v0.93.0 @@ -210,7 +210,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.93.0 diff --git a/cmd/otelcontribcol/exporters_test.go b/cmd/otelcontribcol/exporters_test.go index 8d7eca7fd568..4073b8e1b168 100644 --- a/cmd/otelcontribcol/exporters_test.go +++ b/cmd/otelcontribcol/exporters_test.go @@ -127,7 +127,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "opencensus", getConfigFn: func() component.Config { cfg := expFactories["opencensus"].CreateDefaultConfig().(*opencensusexporter.Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, } // disable queue/retry to validate passing the test data synchronously @@ -141,7 +141,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "opensearch", getConfigFn: func() component.Config { cfg := expFactories["opensearch"].CreateDefaultConfig().(*opensearchexporter.Config) - cfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + cfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "http://" + endpoint, } return cfg @@ -152,7 +152,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "otlp", getConfigFn: func() component.Config { cfg := expFactories["otlp"].CreateDefaultConfig().(*otlpexporter.Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, } // disable queue/retry to validate passing the test data synchronously @@ -266,7 +266,7 @@ func TestDefaultExporters(t *testing.T) { exporter: "alertmanager", getConfigFn: func() component.Config { cfg := expFactories["alertmanager"].CreateDefaultConfig().(*alertmanagerexporter.Config) - cfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + cfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "http://" + endpoint, } cfg.GeneratorURL = "opentelemetry-collector" diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 12f9ad8e66d1..d520d6c69398 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -196,27 +196,27 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d golang.org/x/sys v0.16.0 ) @@ -651,19 +651,19 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index 97922f3b34c3..a02943547c27 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1568,74 +1568,74 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index 83c7453eb1a8..b794f6896bfc 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -6,16 +6,16 @@ dist: otelcol_version: 0.93.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.93.0 import: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opensearchexporter v0.93.0 @@ -27,13 +27,13 @@ exporters: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.93.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.93.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.93.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.93.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index 7f47f2d630b8..3f2b7f70ef61 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -32,21 +32,21 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d golang.org/x/sys v0.16.0 ) @@ -213,24 +213,24 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect go.etcd.io/bbolt v1.3.8 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/cmd/oteltestbedcol/go.sum b/cmd/oteltestbedcol/go.sum index f55f31211ae7..4d7e70ecef3f 100644 --- a/cmd/oteltestbedcol/go.sum +++ b/cmd/oteltestbedcol/go.sum @@ -626,72 +626,72 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/cmd/telemetrygen/go.mod b/cmd/telemetrygen/go.mod index d5f547532426..58e12455b7a7 100644 --- a/cmd/telemetrygen/go.mod +++ b/cmd/telemetrygen/go.mod @@ -7,9 +7,9 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.45.0 @@ -44,8 +44,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/cmd/telemetrygen/go.sum b/cmd/telemetrygen/go.sum index a5cbf19a3de4..fbf5514e8ab7 100644 --- a/cmd/telemetrygen/go.sum +++ b/cmd/telemetrygen/go.sum @@ -91,16 +91,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.45.0 h1:tfil6di0PoNV7FZdsCS7A5izZoVVQ7AuXtyekbOpG/I= diff --git a/cmd/telemetrygen/internal/e2etest/go.mod b/cmd/telemetrygen/internal/e2etest/go.mod index d1028e8767b6..c8d53565a886 100644 --- a/cmd/telemetrygen/internal/e2etest/go.mod +++ b/cmd/telemetrygen/internal/e2etest/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d ) require ( @@ -46,21 +46,21 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/cmd/telemetrygen/internal/e2etest/go.sum b/cmd/telemetrygen/internal/e2etest/go.sum index ebaff1a02418..994b48b25ab7 100644 --- a/cmd/telemetrygen/internal/e2etest/go.sum +++ b/cmd/telemetrygen/internal/e2etest/go.sum @@ -117,44 +117,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/confmap/provider/s3provider/go.mod b/confmap/provider/s3provider/go.mod index 2dc9d4b43f6c..9cde560cc8b1 100644 --- a/confmap/provider/s3provider/go.mod +++ b/confmap/provider/s3provider/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.26.6 github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -32,7 +32,6 @@ 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.0.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect diff --git a/confmap/provider/s3provider/go.sum b/confmap/provider/s3provider/go.sum index 6f53fa53cfe4..658fad195321 100644 --- a/confmap/provider/s3provider/go.sum +++ b/confmap/provider/s3provider/go.sum @@ -34,7 +34,6 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 h1:NzO4Vrau795RkUdSHKEwiR01FaGz github.com/aws/aws-sdk-go-v2/service/sts v1.26.7/go.mod h1:6h2YuIoxaMSCFf5fi1EgZAwdfkGMgDY+DVfa61uLe4U= github.com/aws/smithy-go v1.19.0 h1:KWFKQV80DpP3vJrrA9sVAHQ5gc2z8i4EzrLhLlWXcBM= github.com/aws/smithy-go v1.19.0/go.mod h1:NukqUGpCZIILqqiV0NIjeFh24kd/FAa4beRb6nbIUPE= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= @@ -44,9 +43,8 @@ github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPgh github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU= github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= 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/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= @@ -55,17 +53,16 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= 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= 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-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= 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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/connector/countconnector/go.mod b/connector/countconnector/go.mod index 9e890c6b9c89..f7305affd387 100644 --- a/connector/countconnector/go.mod +++ b/connector/countconnector/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/countconnector/go.sum b/connector/countconnector/go.sum index 9850ad3cf637..30c140029e57 100644 --- a/connector/countconnector/go.sum +++ b/connector/countconnector/go.sum @@ -71,20 +71,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/datadogconnector/go.mod b/connector/datadogconnector/go.mod index c9330ff23974..230feb349f7e 100644 --- a/connector/datadogconnector/go.mod +++ b/connector/datadogconnector/go.mod @@ -11,17 +11,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -138,23 +138,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/connector/datadogconnector/go.sum b/connector/datadogconnector/go.sum index c1eff0990280..54ce6489c39b 100644 --- a/connector/datadogconnector/go.sum +++ b/connector/datadogconnector/go.sum @@ -503,64 +503,64 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/connector/exceptionsconnector/go.mod b/connector/exceptionsconnector/go.mod index be97ea4ffd33..a1692bf75cc7 100644 --- a/connector/exceptionsconnector/go.mod +++ b/connector/exceptionsconnector/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/exceptionsconnector/go.sum b/connector/exceptionsconnector/go.sum index 8246053a4f99..85529cc9cc16 100644 --- a/connector/exceptionsconnector/go.sum +++ b/connector/exceptionsconnector/go.sum @@ -58,22 +58,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/failoverconnector/go.mod b/connector/failoverconnector/go.mod index 7c65a06f71d2..addd168b607a 100644 --- a/connector/failoverconnector/go.mod +++ b/connector/failoverconnector/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/failoverconnector/go.sum b/connector/failoverconnector/go.sum index dc2189c33aea..4d864aa96d8e 100644 --- a/connector/failoverconnector/go.sum +++ b/connector/failoverconnector/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/routingconnector/go.mod b/connector/routingconnector/go.mod index 975da42c0e45..eb350e10a19b 100644 --- a/connector/routingconnector/go.mod +++ b/connector/routingconnector/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/routingconnector/go.sum b/connector/routingconnector/go.sum index 9eb3c0464825..e8837f6b0e6c 100644 --- a/connector/routingconnector/go.sum +++ b/connector/routingconnector/go.sum @@ -71,20 +71,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/connector/servicegraphconnector/go.mod b/connector/servicegraphconnector/go.mod index 779720c674b3..187785a8ed3f 100644 --- a/connector/servicegraphconnector/go.mod +++ b/connector/servicegraphconnector/go.mod @@ -4,17 +4,17 @@ go 1.18 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -61,10 +61,10 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/connector/servicegraphconnector/go.sum b/connector/servicegraphconnector/go.sum index 97ce507e9996..22cc886bc916 100644 --- a/connector/servicegraphconnector/go.sum +++ b/connector/servicegraphconnector/go.sum @@ -133,39 +133,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/connector/spanmetricsconnector/go.mod b/connector/spanmetricsconnector/go.mod index 67b2154da334..e0d560649c83 100644 --- a/connector/spanmetricsconnector/go.mod +++ b/connector/spanmetricsconnector/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/connector/spanmetricsconnector/go.sum b/connector/spanmetricsconnector/go.sum index 6617ab76a475..30e0c6a25f50 100644 --- a/connector/spanmetricsconnector/go.sum +++ b/connector/spanmetricsconnector/go.sum @@ -64,22 +64,22 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/alertmanagerexporter/alertmanager_exporter.go b/exporter/alertmanagerexporter/alertmanager_exporter.go index 663ebd4b45d4..b1adb67cc549 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter.go @@ -181,7 +181,7 @@ func (s *alertmanagerExporter) pushTraces(ctx context.Context, td ptrace.Traces) func (s *alertmanagerExporter) start(_ context.Context, host component.Host) error { - client, err := s.config.HTTPClientConfig.ToClient(host, s.settings) + client, err := s.config.ClientConfig.ToClient(host, s.settings) if err != nil { return fmt.Errorf("failed to create HTTP Client: %w", err) } @@ -203,7 +203,7 @@ func newAlertManagerExporter(cfg *Config, set component.TelemetrySettings) *aler config: cfg, settings: set, tracesMarshaler: &ptrace.JSONMarshaler{}, - endpoint: fmt.Sprintf("%s/api/v1/alerts", cfg.HTTPClientConfig.Endpoint), + endpoint: fmt.Sprintf("%s/api/v1/alerts", cfg.ClientConfig.Endpoint), generatorURL: cfg.GeneratorURL, defaultSeverity: cfg.DefaultSeverity, severityAttribute: cfg.SeverityAttribute, diff --git a/exporter/alertmanagerexporter/alertmanager_exporter_test.go b/exporter/alertmanagerexporter/alertmanager_exporter_test.go index d177d3d2f517..438c44824fe7 100644 --- a/exporter/alertmanagerexporter/alertmanager_exporter_test.go +++ b/exporter/alertmanagerexporter/alertmanager_exporter_test.go @@ -333,7 +333,7 @@ func TestAlertManagerPostAlert(t *testing.T) { } } -func TestHTTPClientConfig(t *testing.T) { +func TestClientConfig(t *testing.T) { endpoint := "http://" + testutil.GetAvailableLocalAddress(t) fmt.Println(endpoint) tests := []struct { @@ -345,7 +345,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "UseSecure", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -356,7 +356,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "Headers", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -368,7 +368,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "CaCert", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -381,7 +381,7 @@ func TestHTTPClientConfig(t *testing.T) { { name: "CertPemFileError", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/alertmanagerexporter/config.go b/exporter/alertmanagerexporter/config.go index 37af19b43d7a..3948dc360137 100644 --- a/exporter/alertmanagerexporter/config.go +++ b/exporter/alertmanagerexporter/config.go @@ -18,10 +18,10 @@ type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` BackoffConfig configretry.BackOffConfig `mapstructure:"retry_on_failure"` - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - GeneratorURL string `mapstructure:"generator_url"` - DefaultSeverity string `mapstructure:"severity"` - SeverityAttribute string `mapstructure:"severity_attribute"` + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + GeneratorURL string `mapstructure:"generator_url"` + DefaultSeverity string `mapstructure:"severity"` + SeverityAttribute string `mapstructure:"severity_attribute"` } var _ component.Config = (*Config)(nil) @@ -29,7 +29,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New("endpoint must be non-empty") } if cfg.DefaultSeverity == "" { diff --git a/exporter/alertmanagerexporter/config_test.go b/exporter/alertmanagerexporter/config_test.go index ab3e5443265f..41a3acda1b42 100644 --- a/exporter/alertmanagerexporter/config_test.go +++ b/exporter/alertmanagerexporter/config_test.go @@ -62,7 +62,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", @@ -107,7 +107,7 @@ func TestConfig_Validate(t *testing.T) { name: "NoEndpoint", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "" + cfg.ClientConfig.Endpoint = "" return cfg }(), wantErr: "endpoint must be non-empty", diff --git a/exporter/alertmanagerexporter/factory.go b/exporter/alertmanagerexporter/factory.go index 1cf729dee7ef..12155d32d6a0 100644 --- a/exporter/alertmanagerexporter/factory.go +++ b/exporter/alertmanagerexporter/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), BackoffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:9093", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/alertmanagerexporter/go.mod b/exporter/alertmanagerexporter/go.mod index dea6407c30c1..cf486ef4d1f7 100644 --- a/exporter/alertmanagerexporter/go.mod +++ b/exporter/alertmanagerexporter/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,15 +51,15 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/alertmanagerexporter/go.sum b/exporter/alertmanagerexporter/go.sum index e2aedf6110b2..6a405eb8bb79 100644 --- a/exporter/alertmanagerexporter/go.sum +++ b/exporter/alertmanagerexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index c513b5169e69..bb284994e307 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -45,12 +45,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index eac76740b55e..ff4b68db69c6 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -349,30 +349,30 @@ go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mI go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index 199361fbbdfc..cef5b8659b75 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -46,10 +46,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index 13a287744bec..7a0fdc965d37 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -73,26 +73,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 19eac6d6af20..d25d3b86b64d 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -51,11 +51,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 69268d6d9435..ac000d5d1c64 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -75,30 +75,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index c1bc661306a1..0859d05a9cbb 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -15,12 +15,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -63,10 +63,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 4d1bd1569ad3..7f461f249194 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -104,27 +104,27 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/awss3exporter/go.mod b/exporter/awss3exporter/go.mod index a2be0273702c..04a69ac53b28 100644 --- a/exporter/awss3exporter/go.mod +++ b/exporter/awss3exporter/go.mod @@ -6,12 +6,12 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,16 +58,16 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/awss3exporter/go.sum b/exporter/awss3exporter/go.sum index 2e7ccc8abda1..b62b8be60cd7 100644 --- a/exporter/awss3exporter/go.sum +++ b/exporter/awss3exporter/go.sum @@ -139,40 +139,40 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index e63e37624d42..4c8d2e10bf0f 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,11 +46,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 312a8d9b2fdb..1da660737be1 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -69,30 +69,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/azuredataexplorerexporter/go.mod b/exporter/azuredataexplorerexporter/go.mod index 7e39215d53de..b129396d7453 100644 --- a/exporter/azuredataexplorerexporter/go.mod +++ b/exporter/azuredataexplorerexporter/go.mod @@ -8,12 +8,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,11 +64,11 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/samber/lo v1.38.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/azuredataexplorerexporter/go.sum b/exporter/azuredataexplorerexporter/go.sum index bb0b227daf42..32f42cc225d4 100644 --- a/exporter/azuredataexplorerexporter/go.sum +++ b/exporter/azuredataexplorerexporter/go.sum @@ -127,28 +127,28 @@ github.com/tj/assert v0.0.3 h1:Df/BlaZ20mq6kuai7f5z2TvPFiwC3xaWJSDQNiIS3Rk= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 6a377ca01e62..0b868534d5eb 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -45,11 +45,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index d072ca99a99c..3cd0f4ec6a20 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -82,30 +82,30 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/tedsuo/ifrit v0.0.0-20180802180643-bea94bb476cc/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 6eff0bcc6d9f..6f70ffe16485 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,12 +43,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index cee2064b965c..155322e211e8 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -62,32 +62,32 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/cassandraexporter/go.mod b/exporter/cassandraexporter/go.mod index 1deeee971125..a70e6a053f68 100644 --- a/exporter/cassandraexporter/go.mod +++ b/exporter/cassandraexporter/go.mod @@ -6,11 +6,11 @@ require ( github.com/gocql/gocql v1.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,12 +42,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/cassandraexporter/go.sum b/exporter/cassandraexporter/go.sum index 48d0873d1845..432c81b6250a 100644 --- a/exporter/cassandraexporter/go.sum +++ b/exporter/cassandraexporter/go.sum @@ -74,28 +74,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index 15f23c901054..cda10036a3f3 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -7,13 +7,13 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,11 +53,11 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shopspring/decimal v1.3.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/clickhouseexporter/go.sum b/exporter/clickhouseexporter/go.sum index 7f62ac3ad5c9..8ad91721209e 100644 --- a/exporter/clickhouseexporter/go.sum +++ b/exporter/clickhouseexporter/go.sum @@ -99,30 +99,30 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/coralogixexporter/config.go b/exporter/coralogixexporter/config.go index 14c92f42ddcb..61eb020438e4 100644 --- a/exporter/coralogixexporter/config.go +++ b/exporter/coralogixexporter/config.go @@ -27,21 +27,21 @@ type Config struct { // Coralogix domain Domain string `mapstructure:"domain"` // GRPC Settings used with Domain - DomainSettings configgrpc.GRPCClientSettings `mapstructure:"domain_settings"` + DomainSettings configgrpc.ClientConfig `mapstructure:"domain_settings"` // Deprecated: [v0.60.0] Coralogix jaeger based trace endpoint // will be removed in the next version // Please use OTLP endpoint using traces.endpoint - configgrpc.GRPCClientSettings `mapstructure:",squash"` + configgrpc.ClientConfig `mapstructure:",squash"` // Coralogix traces ingress endpoint - Traces configgrpc.GRPCClientSettings `mapstructure:"traces"` + Traces configgrpc.ClientConfig `mapstructure:"traces"` // The Coralogix metrics ingress endpoint - Metrics configgrpc.GRPCClientSettings `mapstructure:"metrics"` + Metrics configgrpc.ClientConfig `mapstructure:"metrics"` // The Coralogix logs ingress endpoint - Logs configgrpc.GRPCClientSettings `mapstructure:"logs"` + Logs configgrpc.ClientConfig `mapstructure:"logs"` // Your Coralogix private key (sensitive) for authentication PrivateKey configopaque.String `mapstructure:"private_key"` @@ -79,11 +79,11 @@ func (c *Config) Validate() error { } // check if headers exists - if len(c.GRPCClientSettings.Headers) == 0 { - c.GRPCClientSettings.Headers = make(map[string]configopaque.String) + if len(c.ClientConfig.Headers) == 0 { + c.ClientConfig.Headers = make(map[string]configopaque.String) } - c.GRPCClientSettings.Headers["ACCESS_TOKEN"] = c.PrivateKey - c.GRPCClientSettings.Headers["appName"] = configopaque.String(c.AppName) + c.ClientConfig.Headers["ACCESS_TOKEN"] = c.PrivateKey + c.ClientConfig.Headers["appName"] = configopaque.String(c.AppName) return nil } @@ -116,7 +116,7 @@ func (c *Config) getMetadataFromResource(res pcommon.Resource) (appName, subsyst return appName, subsystem } -func (c *Config) getDomainGrpcSettings() *configgrpc.GRPCClientSettings { +func (c *Config) getDomainGrpcSettings() *configgrpc.ClientConfig { settings := c.DomainSettings settings.Endpoint = fmt.Sprintf("ingress.%s:443", c.Domain) return &settings diff --git a/exporter/coralogixexporter/config_test.go b/exporter/coralogixexporter/config_test.go index 791a5f005293..fea716656874 100644 --- a/exporter/coralogixexporter/config_test.go +++ b/exporter/coralogixexporter/config_test.go @@ -45,19 +45,19 @@ func TestLoadConfig(t *testing.T) { // Deprecated: [v0.47.0] SubSystem will remove in the next version SubSystem: "SUBSYSTEM_NAME", TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, TLSSetting: configtls.TLSClientSetting{ @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { WaitForReady: false, BalancerName: "", }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{}, @@ -100,19 +100,19 @@ func TestLoadConfig(t *testing.T) { // Deprecated: [v0.47.0] SubSystem will remove in the next version SubSystem: "SUBSYSTEM_NAME", TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, }, - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", Compression: configcompression.Gzip, TLSSetting: configtls.TLSClientSetting{ @@ -128,7 +128,7 @@ func TestLoadConfig(t *testing.T) { }, AppNameAttributes: []string{"service.namespace", "k8s.namespace.name"}, SubSystemAttributes: []string{"service.name", "k8s.deployment.name", "k8s.statefulset.name", "k8s.daemonset.name", "k8s.cronjob.name", "k8s.job.name", "k8s.container.name"}, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{}, diff --git a/exporter/coralogixexporter/factory.go b/exporter/coralogixexporter/factory.go index abdec32fe246..a0a1b1ff26ad 100644 --- a/exporter/coralogixexporter/factory.go +++ b/exporter/coralogixexporter/factory.go @@ -35,24 +35,24 @@ func createDefaultConfig() component.Config { QueueSettings: exporterhelper.NewDefaultQueueSettings(), BackOffConfig: configretry.NewDefaultBackOffConfig(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ Compression: configcompression.Gzip, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "https://", }, // Traces GRPC client - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, - Metrics: configgrpc.GRPCClientSettings{ + Metrics: configgrpc.ClientConfig{ Endpoint: "https://", // Default to gzip compression Compression: configcompression.Gzip, WriteBufferSize: 512 * 1024, }, - Logs: configgrpc.GRPCClientSettings{ + Logs: configgrpc.ClientConfig{ Endpoint: "https://", Compression: configcompression.Gzip, }, diff --git a/exporter/coralogixexporter/factory_test.go b/exporter/coralogixexporter/factory_test.go index b2cdfe37a3d7..b3d6a63d5fce 100644 --- a/exporter/coralogixexporter/factory_test.go +++ b/exporter/coralogixexporter/factory_test.go @@ -88,7 +88,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -99,7 +99,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -112,7 +112,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoneCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "none", }, @@ -121,7 +121,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "GzipCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Gzip, }, @@ -130,7 +130,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "SnappyCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Snappy, }, @@ -139,7 +139,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZstdCompression", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Zstd, }, @@ -148,7 +148,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -160,7 +160,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NumConsumers", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, }, }, @@ -168,7 +168,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - Traces: configgrpc.GRPCClientSettings{ + Traces: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -183,7 +183,7 @@ func TestCreateTracesExporter(t *testing.T) { name: "UseDomain", config: &Config{ Domain: "localhost", - DomainSettings: configgrpc.GRPCClientSettings{ + DomainSettings: configgrpc.ClientConfig{ TLSSetting: configtls.TLSClientSetting{ Insecure: false, }, diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 961f6c5da6f3..968ec1cebc0e 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 @@ -49,15 +49,15 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/coralogixexporter/go.sum b/exporter/coralogixexporter/go.sum index bafec9f58fb5..a140d947ea85 100644 --- a/exporter/coralogixexporter/go.sum +++ b/exporter/coralogixexporter/go.sum @@ -74,44 +74,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/datadogexporter/config.go b/exporter/datadogexporter/config.go index 97b8194b765d..39695bce64d4 100644 --- a/exporter/datadogexporter/config.go +++ b/exporter/datadogexporter/config.go @@ -377,14 +377,14 @@ type HostMetadataConfig struct { Tags []string `mapstructure:"tags"` } -// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedHTTPClientConfig for more details +// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedClientConfig for more details type LimitedTLSClientSettings struct { // InsecureSkipVerify controls whether a client verifies the server's // certificate chain and host name. InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` } -type LimitedHTTPClientConfig struct { +type LimitedClientConfig struct { TLSSetting LimitedTLSClientSettings `mapstructure:"tls,omitempty"` } @@ -394,7 +394,7 @@ type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - LimitedHTTPClientConfig `mapstructure:",squash"` + LimitedClientConfig `mapstructure:",squash"` TagsConfig `mapstructure:",squash"` diff --git a/exporter/datadogexporter/config_test.go b/exporter/datadogexporter/config_test.go index dfd5e369af77..a4aaa2edbd93 100644 --- a/exporter/datadogexporter/config_test.go +++ b/exporter/datadogexporter/config_test.go @@ -94,7 +94,7 @@ func TestValidate(t *testing.T) { name: "TLS settings are valid", cfg: &Config{ API: APIConfig{Key: "notnull"}, - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ TLSSetting: LimitedTLSClientSettings{ InsecureSkipVerify: true, }, diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 77155da0524b..c6a9064f858b 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -32,23 +32,23 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -226,17 +226,17 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zorkian/go-datadog-api v2.30.0+incompatible // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 5830e7dc9a92..183fb72b8dd7 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -726,64 +726,64 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/datadogexporter/integrationtest/go.mod b/exporter/datadogexporter/integrationtest/go.mod index 2b16619240b0..0264d0487fad 100644 --- a/exporter/datadogexporter/integrationtest/go.mod +++ b/exporter/datadogexporter/integrationtest/go.mod @@ -10,17 +10,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 @@ -140,23 +140,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/exporter/datadogexporter/integrationtest/go.sum b/exporter/datadogexporter/integrationtest/go.sum index 37e6c42bab7a..3f2a5f3effbd 100644 --- a/exporter/datadogexporter/integrationtest/go.sum +++ b/exporter/datadogexporter/integrationtest/go.sum @@ -503,64 +503,64 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/datadogexporter/logs_exporter.go b/exporter/datadogexporter/logs_exporter.go index 0d1dd5f89520..a51663ebdecb 100644 --- a/exporter/datadogexporter/logs_exporter.go +++ b/exporter/datadogexporter/logs_exporter.go @@ -57,7 +57,7 @@ func newLogsExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() } else { client := clientutil.CreateZorkianClient(string(cfg.API.Key), cfg.Metrics.TCPAddr.Endpoint) @@ -74,7 +74,7 @@ func newLogsExporter( if err != nil { return nil, fmt.Errorf("failed to create logs translator: %w", err) } - s := logs.NewSender(cfg.Logs.TCPAddr.Endpoint, params.Logger, cfg.TimeoutSettings, cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify, cfg.Logs.DumpPayloads, string(cfg.API.Key)) + s := logs.NewSender(cfg.Logs.TCPAddr.Endpoint, params.Logger, cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify, cfg.Logs.DumpPayloads, string(cfg.API.Key)) return &logsExporter{ params: params, diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 7c8dc0040887..1f7958963b00 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -127,13 +127,13 @@ func newMetricsExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() exporter.metricsAPI = datadogV2.NewMetricsApi(apiClient) } else { client := clientutil.CreateZorkianClient(string(cfg.API.Key), cfg.Metrics.TCPAddr.Endpoint) client.ExtraHeader["User-Agent"] = clientutil.UserAgent(params.BuildInfo) - client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + client.HttpClient = clientutil.NewHTTPClient(cfg.TimeoutSettings, cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKeyZorkian(params.Logger, client) }() exporter.client = client } diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index cbbe83d164ab..e9ce7a8ba65c 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -72,7 +72,7 @@ func newTracesExporter( params.BuildInfo, cfg.Metrics.TCPAddr.Endpoint, cfg.TimeoutSettings, - cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify) + cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify) go func() { errchan <- clientutil.ValidateAPIKey(ctx, string(cfg.API.Key), params.Logger, apiClient) }() exp.metricsAPI = datadogV2.NewMetricsApi(apiClient) } else { @@ -196,7 +196,7 @@ func newTraceAgent(ctx context.Context, params exporter.CreateSettings, cfg *Con acfg.Ignore["resource"] = cfg.Traces.IgnoreResources acfg.ReceiverPort = 0 // disable HTTP receiver acfg.AgentVersion = fmt.Sprintf("datadogexporter-%s-%s", params.BuildInfo.Command, params.BuildInfo.Version) - acfg.SkipSSLValidation = cfg.LimitedHTTPClientConfig.TLSSetting.InsecureSkipVerify + acfg.SkipSSLValidation = cfg.LimitedClientConfig.TLSSetting.InsecureSkipVerify acfg.ComputeStatsBySpanKind = cfg.Traces.ComputeStatsBySpanKind acfg.PeerServiceAggregation = cfg.Traces.PeerServiceAggregation acfg.PeerTagsAggregation = cfg.Traces.PeerTagsAggregation diff --git a/exporter/datasetexporter/go.mod b/exporter/datasetexporter/go.mod index f948bc763c36..725ad84ebc77 100644 --- a/exporter/datasetexporter/go.mod +++ b/exporter/datasetexporter/go.mod @@ -8,18 +8,18 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/scalyr/dataset-go v0.17.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/zap v1.26.0 ) require ( github.com/cenkalti/backoff/v4 v4.2.1 - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -47,11 +47,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/datasetexporter/go.sum b/exporter/datasetexporter/go.sum index 54c45d48057c..16f5e6b7fef9 100644 --- a/exporter/datasetexporter/go.sum +++ b/exporter/datasetexporter/go.sum @@ -66,28 +66,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/dynatraceexporter/config/config.go b/exporter/dynatraceexporter/config/config.go index 2ea22cb093f6..5d9df8ac11b3 100644 --- a/exporter/dynatraceexporter/config/config.go +++ b/exporter/dynatraceexporter/config/config.go @@ -19,7 +19,7 @@ import ( // Config defines configuration for the Dynatrace exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -44,8 +44,8 @@ func (c *Config) Validate() error { return fmt.Errorf("queue settings has invalid configuration: %w", err) } - if c.HTTPClientConfig.Headers == nil { - c.HTTPClientConfig.Headers = make(map[string]configopaque.String) + if c.ClientConfig.Headers == nil { + c.ClientConfig.Headers = make(map[string]configopaque.String) } c.APIToken = strings.TrimSpace(c.APIToken) @@ -56,15 +56,15 @@ func (c *Config) Validate() error { return errors.New("api_token is required if Endpoint is provided") } - c.HTTPClientConfig.Headers["Authorization"] = configopaque.String(fmt.Sprintf("Api-Token %s", c.APIToken)) + c.ClientConfig.Headers["Authorization"] = configopaque.String(fmt.Sprintf("Api-Token %s", c.APIToken)) } if !(strings.HasPrefix(c.Endpoint, "http://") || strings.HasPrefix(c.Endpoint, "https://")) { return errors.New("endpoint must start with https:// or http://") } - c.HTTPClientConfig.Headers["Content-Type"] = "text/plain; charset=UTF-8" - c.HTTPClientConfig.Headers["User-Agent"] = "opentelemetry-collector" + c.ClientConfig.Headers["Content-Type"] = "text/plain; charset=UTF-8" + c.ClientConfig.Headers["User-Agent"] = "opentelemetry-collector" return nil } diff --git a/exporter/dynatraceexporter/config/config_test.go b/exporter/dynatraceexporter/config/config_test.go index 78cdb3904b36..6ac082b9b642 100644 --- a/exporter/dynatraceexporter/config/config_test.go +++ b/exporter/dynatraceexporter/config/config_test.go @@ -22,7 +22,7 @@ func TestConfig_Validate(t *testing.T) { }) t.Run("Valid configuration", func(t *testing.T) { - c := &Config{HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "http://example.com/"}, APIToken: "token"} + c := &Config{ClientConfig: confighttp.ClientConfig{Endpoint: "http://example.com/"}, APIToken: "token"} err := c.Validate() assert.NoError(t, err) @@ -30,7 +30,7 @@ func TestConfig_Validate(t *testing.T) { }) t.Run("Invalid Endpoint", func(t *testing.T) { - c := &Config{HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "example.com"}} + c := &Config{ClientConfig: confighttp.ClientConfig{Endpoint: "example.com"}} err := c.Validate() assert.Error(t, err) }) diff --git a/exporter/dynatraceexporter/factory.go b/exporter/dynatraceexporter/factory.go index 0bec7afcf576..c01baa8ef51e 100644 --- a/exporter/dynatraceexporter/factory.go +++ b/exporter/dynatraceexporter/factory.go @@ -35,8 +35,8 @@ func createDefaultConfig() component.Config { Enabled: false, }, - APIToken: "", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ""}, + APIToken: "", + ClientConfig: confighttp.ClientConfig{Endpoint: ""}, Tags: []string{}, DefaultDimensions: make(map[string]string), diff --git a/exporter/dynatraceexporter/factory_test.go b/exporter/dynatraceexporter/factory_test.go index 5676d2dc1bcf..a4bccad37aed 100644 --- a/exporter/dynatraceexporter/factory_test.go +++ b/exporter/dynatraceexporter/factory_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: apiconstants.GetDefaultOneAgentEndpoint(), Headers: map[string]configopaque.String{ "Content-Type": "text/plain; charset=UTF-8", @@ -75,7 +75,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com/api/v2/metrics/ingest", Headers: map[string]configopaque.String{ "Authorization": "Api-Token token", @@ -98,7 +98,7 @@ func TestLoadConfig(t *testing.T) { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com/api/v2/metrics/ingest", Headers: map[string]configopaque.String{ "Authorization": "Api-Token token", diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 724e616ca955..97c0d5621283 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -9,15 +9,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,15 +53,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index c29aaf6325c0..a914f3ab91a8 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -74,42 +74,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/dynatraceexporter/metrics_exporter.go b/exporter/dynatraceexporter/metrics_exporter.go index 41628b038ad7..c45a41a1bec5 100644 --- a/exporter/dynatraceexporter/metrics_exporter.go +++ b/exporter/dynatraceexporter/metrics_exporter.go @@ -279,7 +279,7 @@ func (e *metricsExporter) sendBatch(ctx context.Context, lines []string) error { // start starts the exporter func (e *metricsExporter) start(_ context.Context, host component.Host) (err error) { - client, err := e.cfg.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.cfg.ClientConfig.ToClient(host, e.settings) if err != nil { e.settings.Logger.Error("Failed to construct HTTP client", zap.Error(err)) return fmt.Errorf("start: %w", err) diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index f0c08521c47d..ae31e474dce4 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -145,7 +145,7 @@ func Test_exporter_PushMetricsData(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -308,9 +308,9 @@ func Test_SumMetrics(t *testing.T) { exp := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, - Prefix: "prefix", + APIToken: "token", + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, + Prefix: "prefix", }, client: ts.Client(), prevPts: prevPts, @@ -371,7 +371,7 @@ func Test_exporter_PushMetricsData_EmptyPayload(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -408,7 +408,7 @@ func Test_exporter_PushMetricsData_isDisabled(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), isDisabled: true, @@ -434,7 +434,7 @@ func Test_exporter_send_BadRequest(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -459,7 +459,7 @@ func Test_exporter_send_Unauthorized(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -484,7 +484,7 @@ func Test_exporter_send_TooLarge(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -510,7 +510,7 @@ func Test_exporter_send_NotFound(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -538,7 +538,7 @@ func Test_exporter_send_TooManyRequests(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -561,7 +561,7 @@ func Test_exporter_send_MiscellaneousErrorCode(t *testing.T) { settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -591,7 +591,7 @@ func Test_exporter_send_chunking(t *testing.T) { e := &metricsExporter{ settings: componenttest.NewNopTelemetrySettings(), cfg: &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, }, client: ts.Client(), } @@ -658,7 +658,7 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { logger: zap.NewNop(), cfg: &config.Config{ APIToken: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ts.URL}, + ClientConfig: confighttp.ClientConfig{Endpoint: ts.URL}, Prefix: "prefix", DefaultDimensions: map[string]string{}, }, @@ -685,9 +685,9 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { }) } -func Test_exporter_start_InvalidHTTPClientConfig(t *testing.T) { +func Test_exporter_start_InvalidClientConfig(t *testing.T) { cfg := &config.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go index 3fb518be35fe..f755844420bd 100644 --- a/exporter/elasticsearchexporter/config.go +++ b/exporter/elasticsearchexporter/config.go @@ -56,12 +56,12 @@ type Config struct { // https://www.elastic.co/guide/en/elasticsearch/reference/current/ingest.html Pipeline string `mapstructure:"pipeline"` - HTTPClientConfig `mapstructure:",squash"` - Discovery DiscoverySettings `mapstructure:"discover"` - Retry RetrySettings `mapstructure:"retry"` - Flush FlushSettings `mapstructure:"flush"` - Mapping MappingsSettings `mapstructure:"mapping"` - LogstashFormat LogstashFormatSettings `mapstructure:"logstash_format"` + ClientConfig `mapstructure:",squash"` + Discovery DiscoverySettings `mapstructure:"discover"` + Retry RetrySettings `mapstructure:"retry"` + Flush FlushSettings `mapstructure:"flush"` + Mapping MappingsSettings `mapstructure:"mapping"` + LogstashFormat LogstashFormatSettings `mapstructure:"logstash_format"` } type LogstashFormatSettings struct { @@ -74,7 +74,7 @@ type DynamicIndexSetting struct { Enabled bool `mapstructure:"enabled"` } -type HTTPClientConfig struct { +type ClientConfig struct { Authentication AuthenticationSettings `mapstructure:",squash"` // ReadBufferSize for HTTP client. See http.Transport.ReadBufferSize. diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go index b91f04fc14d1..5e7ad7a47fa2 100644 --- a/exporter/elasticsearchexporter/config_test.go +++ b/exporter/elasticsearchexporter/config_test.go @@ -39,7 +39,7 @@ func TestLoad_DeprecatedIndexConfigOption(t *testing.T) { LogsIndex: "logs-generic-default", TracesIndex: "traces-generic-default", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", @@ -110,7 +110,7 @@ func TestLoadConfig(t *testing.T) { LogsIndex: "logs-generic-default", TracesIndex: "trace_index", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", @@ -160,7 +160,7 @@ func TestLoadConfig(t *testing.T) { LogsIndex: "my_log_index", TracesIndex: "traces-generic-default", Pipeline: "mypipeline", - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Authentication: AuthenticationSettings{ User: "elastic", Password: "search", diff --git a/exporter/elasticsearchexporter/factory.go b/exporter/elasticsearchexporter/factory.go index 20cf9c9175d5..518eba3eccff 100644 --- a/exporter/elasticsearchexporter/factory.go +++ b/exporter/elasticsearchexporter/factory.go @@ -40,7 +40,7 @@ func createDefaultConfig() component.Config { qs.Enabled = false return &Config{ QueueSettings: qs, - HTTPClientConfig: HTTPClientConfig{ + ClientConfig: ClientConfig{ Timeout: 90 * time.Second, }, Index: "", diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 3ceaf6de4425..ae0539408d82 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,12 +47,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index e4fe582b0a8a..972d2b40ea05 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -73,32 +73,32 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/f5cloudexporter/config_test.go b/exporter/f5cloudexporter/config_test.go index 51adad33c768..0e82a41ae75f 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -47,7 +47,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, } - otlphttpCfg.HTTPClientConfig = confighttp.HTTPClientConfig{ + otlphttpCfg.ClientConfig = confighttp.ClientConfig{ Endpoint: "https://f5cloud", ReadBufferSize: 123, WriteBufferSize: 345, @@ -66,8 +66,8 @@ func TestLoadConfig(t *testing.T) { }, } // testing function equality is not supported in Go hence these will be ignored for this test - expectedCfg.HTTPClientConfig.CustomRoundTripper = nil - actualCfg.HTTPClientConfig.CustomRoundTripper = nil + expectedCfg.ClientConfig.CustomRoundTripper = nil + actualCfg.ClientConfig.CustomRoundTripper = nil assert.Equal(t, expectedCfg, actualCfg) } diff --git a/exporter/f5cloudexporter/factory.go b/exporter/f5cloudexporter/factory.go index 308ff8c33bc0..25eac8407722 100644 --- a/exporter/f5cloudexporter/factory.go +++ b/exporter/f5cloudexporter/factory.go @@ -97,7 +97,7 @@ func (f *f5cloudFactory) CreateDefaultConfig() component.Config { cfg.Headers["User-Agent"] = "opentelemetry-collector-contrib {{version}}" - cfg.HTTPClientConfig.CustomRoundTripper = func(next http.RoundTripper) (http.RoundTripper, error) { + cfg.ClientConfig.CustomRoundTripper = func(next http.RoundTripper) (http.RoundTripper, error) { ts, err := f.getTokenSource(cfg) if err != nil { return nil, err diff --git a/exporter/f5cloudexporter/factory_test.go b/exporter/f5cloudexporter/factory_test.go index 917282d8422e..6b0203f15633 100644 --- a/exporter/f5cloudexporter/factory_test.go +++ b/exporter/f5cloudexporter/factory_test.go @@ -32,8 +32,8 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { assert.NoError(t, componenttest.CheckConfigStruct(cfg)) ocfg, ok := factory.CreateDefaultConfig().(*Config) assert.True(t, ok) - assert.Equal(t, ocfg.HTTPClientConfig.Endpoint, "") - assert.Equal(t, ocfg.HTTPClientConfig.Timeout, 30*time.Second, "default timeout is 30 seconds") + assert.Equal(t, ocfg.ClientConfig.Endpoint, "") + assert.Equal(t, ocfg.ClientConfig.Timeout, 30*time.Second, "default timeout is 30 seconds") assert.Equal(t, ocfg.RetryConfig.Enabled, true, "default retry is enabled") assert.Equal(t, ocfg.RetryConfig.MaxElapsedTime, 300*time.Second, "default retry MaxElapsedTime") assert.Equal(t, ocfg.RetryConfig.InitialInterval, 5*time.Second, "default retry InitialInterval") @@ -44,7 +44,7 @@ func TestFactory_CreateDefaultConfig(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -75,7 +75,7 @@ func TestFactory_CreateMetricsExporterInvalidConfig(t *testing.T) { func TestFactory_CreateTracesExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -106,7 +106,7 @@ func Test_Factory_CreateTracesExporterInvalidConfig(t *testing.T) { func TestFactory_CreateLogsExporter(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", @@ -137,7 +137,7 @@ func TestFactory_CreateLogsExporterInvalidConfig(t *testing.T) { func TestFactory_getTokenSourceFromConfig(t *testing.T) { factory := newFactoryWithTokenSourceGetter(mockTokenSourceGetter) cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = "https://" + testutil.GetAvailableLocalAddress(t) cfg.Source = "tests" cfg.AuthConfig = AuthConfig{ CredentialFile: "testdata/empty_credential_file.json", diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 482e7b3a4e89..60b423824e8f 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -6,13 +6,13 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,18 +54,18 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index a278115ee55d..79b7408c798e 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -123,44 +123,44 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index f709beb0c344..bc5df36cf660 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,11 +41,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 1a39b1df1adf..429b24d4f20a 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -62,26 +62,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index f8ca774b3958..b2331f53b13d 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,14 +58,14 @@ require ( github.com/tidwall/tinylru v1.1.0 // indirect github.com/tidwall/wal v1.1.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index f2dcaa9b171b..956c0aa3f38f 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -142,30 +142,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 535da6fe304d..bb7106a7da2c 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -6,12 +6,12 @@ require ( cloud.google.com/go/pubsub v1.36.1 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -54,10 +54,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 0a18eb00640b..8063e213f09b 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -125,26 +125,26 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 7cf7ec0941a6..44f12ed285a4 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -6,9 +6,9 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.45.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.45.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -72,19 +72,19 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/exporter/googlemanagedprometheusexporter/go.sum b/exporter/googlemanagedprometheusexporter/go.sum index 7a0877b58263..ca62677e20e0 100644 --- a/exporter/googlemanagedprometheusexporter/go.sum +++ b/exporter/googlemanagedprometheusexporter/go.sum @@ -176,40 +176,40 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/exporter/honeycombmarkerexporter/config.go b/exporter/honeycombmarkerexporter/config.go index 4380bd6f0c5b..47b739f36120 100644 --- a/exporter/honeycombmarkerexporter/config.go +++ b/exporter/honeycombmarkerexporter/config.go @@ -28,7 +28,7 @@ type Config struct { // Markers is the list of markers to create Markers []Marker `mapstructure:"markers"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` } diff --git a/exporter/honeycombmarkerexporter/go.mod b/exporter/honeycombmarkerexporter/go.mod index 222d9f26630a..45862f5da0a5 100644 --- a/exporter/honeycombmarkerexporter/go.mod +++ b/exporter/honeycombmarkerexporter/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,17 +54,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/honeycombmarkerexporter/go.sum b/exporter/honeycombmarkerexporter/go.sum index c5e007a6fa23..2ca5f0f2a72a 100644 --- a/exporter/honeycombmarkerexporter/go.sum +++ b/exporter/honeycombmarkerexporter/go.sum @@ -85,42 +85,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/honeycombmarkerexporter/logs_exporter.go b/exporter/honeycombmarkerexporter/logs_exporter.go index 85dfd927e747..860c38603f9e 100644 --- a/exporter/honeycombmarkerexporter/logs_exporter.go +++ b/exporter/honeycombmarkerexporter/logs_exporter.go @@ -40,7 +40,7 @@ type marker struct { type honeycombLogsExporter struct { set component.TelemetrySettings client *http.Client - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig apiURL string apiKey configopaque.String markers []marker @@ -66,7 +66,7 @@ func newHoneycombLogsExporter(set exporter.CreateSettings, config *Config) (*hon } logsExp := &honeycombLogsExporter{ set: telemetrySettings, - httpClientSettings: config.HTTPClientConfig, + httpClientSettings: config.ClientConfig, apiURL: config.APIURL, apiKey: config.APIKey, markers: markers, diff --git a/exporter/influxdbexporter/config.go b/exporter/influxdbexporter/config.go index 1fadb1eb34f7..53103640489b 100644 --- a/exporter/influxdbexporter/config.go +++ b/exporter/influxdbexporter/config.go @@ -28,7 +28,7 @@ type V1Compatibility struct { // Config defines configuration for the InfluxDB exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 85024ab0de6a..ea8f355e69b5 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -38,7 +38,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "override-config"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:8080", Timeout: 500 * time.Millisecond, Headers: map[string]configopaque.String{"User-Agent": "OpenTelemetry -> Influx"}, diff --git a/exporter/influxdbexporter/factory.go b/exporter/influxdbexporter/factory.go index 792faced9200..2f8eb08c11f2 100644 --- a/exporter/influxdbexporter/factory.go +++ b/exporter/influxdbexporter/factory.go @@ -35,7 +35,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, Headers: map[string]configopaque.String{ "User-Agent": "OpenTelemetry -> Influx", diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index 31c32abdcf9e..e8bad0b5f6fc 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -8,13 +8,13 @@ require ( github.com/influxdata/influxdb-observability/otel2influx v0.5.8 github.com/influxdata/line-protocol/v2 v2.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,17 +45,17 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index a30244804c2f..f6abbd686970 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -93,43 +93,43 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/influxdbexporter/writer.go b/exporter/influxdbexporter/writer.go index 5bf195130a8e..b27e99ca9ee0 100644 --- a/exporter/influxdbexporter/writer.go +++ b/exporter/influxdbexporter/writer.go @@ -30,7 +30,7 @@ type influxHTTPWriter struct { encoderPool sync.Pool httpClient *http.Client - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig telemetrySettings component.TelemetrySettings writeURL string payloadMaxLines int @@ -54,7 +54,7 @@ func newInfluxHTTPWriter(logger common.Logger, config *Config, telemetrySettings return e }, }, - httpClientSettings: config.HTTPClientConfig, + httpClientSettings: config.ClientConfig, telemetrySettings: telemetrySettings, writeURL: writeURL, payloadMaxLines: config.PayloadMaxLines, @@ -64,7 +64,7 @@ func newInfluxHTTPWriter(logger common.Logger, config *Config, telemetrySettings } func composeWriteURL(config *Config) (string, error) { - writeURL, err := url.Parse(config.HTTPClientConfig.Endpoint) + writeURL, err := url.Parse(config.ClientConfig.Endpoint) if err != nil { return "", err } @@ -90,20 +90,20 @@ func composeWriteURL(config *Config) (string, error) { if config.V1Compatibility.Username != "" && config.V1Compatibility.Password != "" { basicAuth := base64.StdEncoding.EncodeToString( []byte(config.V1Compatibility.Username + ":" + string(config.V1Compatibility.Password))) - if config.HTTPClientConfig.Headers == nil { - config.HTTPClientConfig.Headers = make(map[string]configopaque.String, 1) + if config.ClientConfig.Headers == nil { + config.ClientConfig.Headers = make(map[string]configopaque.String, 1) } - config.HTTPClientConfig.Headers["Authorization"] = configopaque.String("Basic " + basicAuth) + config.ClientConfig.Headers["Authorization"] = configopaque.String("Basic " + basicAuth) } } else { queryValues.Set("org", config.Org) queryValues.Set("bucket", config.Bucket) if config.Token != "" { - if config.HTTPClientConfig.Headers == nil { - config.HTTPClientConfig.Headers = make(map[string]configopaque.String, 1) + if config.ClientConfig.Headers == nil { + config.ClientConfig.Headers = make(map[string]configopaque.String, 1) } - config.HTTPClientConfig.Headers["Authorization"] = "Token " + config.Token + config.ClientConfig.Headers["Authorization"] = "Token " + config.Token } } diff --git a/exporter/influxdbexporter/writer_test.go b/exporter/influxdbexporter/writer_test.go index cbed0d4f8ef3..d8d23cc1fd44 100644 --- a/exporter/influxdbexporter/writer_test.go +++ b/exporter/influxdbexporter/writer_test.go @@ -162,7 +162,7 @@ func Test_influxHTTPWriterBatch_EnqueuePoint_emptyTagValue(t *testing.T) { influxWriter, err := newInfluxHTTPWriter( new(common.NoopLogger), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: noopHTTPServer.URL, }, }, diff --git a/exporter/instanaexporter/config.go b/exporter/instanaexporter/config.go index 9a2d584445d1..7a7c6c95aba0 100644 --- a/exporter/instanaexporter/config.go +++ b/exporter/instanaexporter/config.go @@ -19,7 +19,7 @@ type Config struct { AgentKey configopaque.String `mapstructure:"agent_key"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` } var _ component.Config = (*Config)(nil) diff --git a/exporter/instanaexporter/config_test.go b/exporter/instanaexporter/config_test.go index 0616290ede0b..fa05153942b6 100644 --- a/exporter/instanaexporter/config_test.go +++ b/exporter/instanaexporter/config_test.go @@ -28,7 +28,7 @@ func TestConfigValidate(t *testing.T) { }) t.Run("Valid configuration with ca_file", func(t *testing.T) { - c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", HTTPClientConfig: confighttp.HTTPClientConfig{ + c := &Config{Endpoint: "https://example.com/", AgentKey: "key1", ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "ca.crt", diff --git a/exporter/instanaexporter/exporter.go b/exporter/instanaexporter/exporter.go index fc58c74c1455..9cdbcfbf3dda 100644 --- a/exporter/instanaexporter/exporter.go +++ b/exporter/instanaexporter/exporter.go @@ -30,7 +30,7 @@ type instanaExporter struct { } func (e *instanaExporter) start(_ context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return err } diff --git a/exporter/instanaexporter/exporter_test.go b/exporter/instanaexporter/exporter_test.go index 405359e0e7cc..d81a7711202f 100644 --- a/exporter/instanaexporter/exporter_test.go +++ b/exporter/instanaexporter/exporter_test.go @@ -27,9 +27,9 @@ func TestPushConvertedTraces(t *testing.T) { defer traceServer.Close() cfg := Config{ - AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: traceServer.URL}, - Endpoint: traceServer.URL, + AgentKey: "key11", + ClientConfig: confighttp.ClientConfig{Endpoint: traceServer.URL}, + Endpoint: traceServer.URL, } instanaExporter := newInstanaExporter(&cfg, exportertest.NewNopCreateSettings()) @@ -82,7 +82,7 @@ func TestSelfSignedBackend(t *testing.T) { cfg := Config{ AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -108,7 +108,7 @@ func TestSelfSignedBackend(t *testing.T) { func TestSelfSignedBackendCAFileNotFound(t *testing.T) { cfg := Config{ AgentKey: "key11", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/instanaexporter/factory.go b/exporter/instanaexporter/factory.go index ff5bbf99770b..df2749f014dd 100644 --- a/exporter/instanaexporter/factory.go +++ b/exporter/instanaexporter/factory.go @@ -32,7 +32,7 @@ func NewFactory() exporter.Factory { // createDefaultConfig creates the default exporter configuration func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/instanaexporter/factory_test.go b/exporter/instanaexporter/factory_test.go index f62b06579bd7..63643b76f855 100644 --- a/exporter/instanaexporter/factory_test.go +++ b/exporter/instanaexporter/factory_test.go @@ -26,7 +26,7 @@ func TestCreateDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -53,7 +53,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -74,7 +74,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -100,7 +100,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com/api/", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/instanaexporter/go.mod b/exporter/instanaexporter/go.mod index 6b5697efd692..8c20e8ca231c 100644 --- a/exporter/instanaexporter/go.mod +++ b/exporter/instanaexporter/go.mod @@ -5,16 +5,16 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/instanaexporter/go.sum b/exporter/instanaexporter/go.sum index e2aedf6110b2..6a405eb8bb79 100644 --- a/exporter/instanaexporter/go.sum +++ b/exporter/instanaexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index b01b3f5413d8..95de79ef66b2 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -14,14 +14,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -71,11 +71,11 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index e94f20de507f..be42b321afe4 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -128,32 +128,32 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/kineticaexporter/go.mod b/exporter/kineticaexporter/go.mod index 61558f18760e..34de1c28ce6b 100644 --- a/exporter/kineticaexporter/go.mod +++ b/exporter/kineticaexporter/go.mod @@ -8,11 +8,11 @@ require ( github.com/samber/lo v1.39.0 github.com/stretchr/testify v1.8.4 github.com/wk8/go-ordered-map/v2 v2.1.8 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -54,12 +54,12 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/ztrue/tracerr v0.3.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/kineticaexporter/go.sum b/exporter/kineticaexporter/go.sum index a835c40288cf..e19327b8431a 100644 --- a/exporter/kineticaexporter/go.sum +++ b/exporter/kineticaexporter/go.sum @@ -88,28 +88,28 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/ztrue/tracerr v0.3.0 h1:lDi6EgEYhPYPnKcjsYzmWw4EkFEoA/gfe+I9Y5f+h6Y= github.com/ztrue/tracerr v0.3.0/go.mod h1:qEalzze4VN9O8tnhBXScfCrmoJo10o8TN5ciKjm6Mww= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index 71bad2d29dc4..4214331b7e58 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -83,23 +83,23 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 336c39090ff2..1ad37f262cce 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -188,57 +188,57 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/loadbalancingexporter/metrics_exporter_test.go b/exporter/loadbalancingexporter/metrics_exporter_test.go index c141fa7118ef..3163b96f1d41 100644 --- a/exporter/loadbalancingexporter/metrics_exporter_test.go +++ b/exporter/loadbalancingexporter/metrics_exporter_test.go @@ -420,9 +420,9 @@ func TestBuildExporterConfigUnknown(t *testing.T) { exporterCfg := buildExporterConfig(c.(*Config), "the-endpoint") // verify - grpcSettings := defaultCfg.GRPCClientSettings + grpcSettings := defaultCfg.ClientConfig grpcSettings.Endpoint = "the-endpoint" - assert.Equal(t, grpcSettings, exporterCfg.GRPCClientSettings) + assert.Equal(t, grpcSettings, exporterCfg.ClientConfig) assert.Equal(t, defaultCfg.TimeoutSettings, exporterCfg.TimeoutSettings) assert.Equal(t, defaultCfg.QueueConfig, exporterCfg.QueueConfig) diff --git a/exporter/loadbalancingexporter/trace_exporter_test.go b/exporter/loadbalancingexporter/trace_exporter_test.go index 72d48654d97c..350fe6168d89 100644 --- a/exporter/loadbalancingexporter/trace_exporter_test.go +++ b/exporter/loadbalancingexporter/trace_exporter_test.go @@ -310,9 +310,9 @@ func TestBuildExporterConfig(t *testing.T) { exporterCfg := buildExporterConfig(c.(*Config), "the-endpoint") // verify - grpcSettings := defaultCfg.GRPCClientSettings + grpcSettings := defaultCfg.ClientConfig grpcSettings.Endpoint = "the-endpoint" - assert.Equal(t, grpcSettings, exporterCfg.GRPCClientSettings) + assert.Equal(t, grpcSettings, exporterCfg.ClientConfig) assert.Equal(t, defaultCfg.TimeoutSettings, exporterCfg.TimeoutSettings) assert.Equal(t, defaultCfg.QueueConfig, exporterCfg.QueueConfig) diff --git a/exporter/logicmonitorexporter/config.go b/exporter/logicmonitorexporter/config.go index c7c7fa46ab83..f5625988288d 100644 --- a/exporter/logicmonitorexporter/config.go +++ b/exporter/logicmonitorexporter/config.go @@ -18,7 +18,7 @@ import ( // Config defines configuration for LogicMonitor exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/logicmonitorexporter/config_test.go b/exporter/logicmonitorexporter/config_test.go index 19113ed17356..2e9cf01edca7 100644 --- a/exporter/logicmonitorexporter/config_test.go +++ b/exporter/logicmonitorexporter/config_test.go @@ -31,7 +31,7 @@ func TestConfigValidation(t *testing.T) { { name: "empty endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", }, }, @@ -41,7 +41,7 @@ func TestConfigValidation(t *testing.T) { { name: "missing http scheme", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "test.com/dummy", }, }, @@ -51,7 +51,7 @@ func TestConfigValidation(t *testing.T) { { name: "invalid endpoint format", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid.com@#$%", }, }, @@ -61,7 +61,7 @@ func TestConfigValidation(t *testing.T) { { name: "valid config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://validurl.com/rest", }, }, @@ -104,7 +104,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", }, APIToken: APIToken{ @@ -118,7 +118,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", Headers: map[string]configopaque.String{ "Authorization": "Bearer ", @@ -131,7 +131,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://company.logicmonitor.com/rest", Headers: map[string]configopaque.String{ "Authorization": "Bearer ", diff --git a/exporter/logicmonitorexporter/factory_test.go b/exporter/logicmonitorexporter/factory_test.go index b4772e7014eb..4f03d0b61ad8 100644 --- a/exporter/logicmonitorexporter/factory_test.go +++ b/exporter/logicmonitorexporter/factory_test.go @@ -38,7 +38,7 @@ func TestCreateLogsExporter(t *testing.T) { { name: "valid config", config: Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, }, @@ -78,7 +78,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "valid config", config: Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, }, diff --git a/exporter/logicmonitorexporter/go.mod b/exporter/logicmonitorexporter/go.mod index 5b996e31bd95..9f3e3bb84277 100644 --- a/exporter/logicmonitorexporter/go.mod +++ b/exporter/logicmonitorexporter/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/logicmonitorexporter/go.sum b/exporter/logicmonitorexporter/go.sum index a05dab8da8f6..04bd8f013fe2 100644 --- a/exporter/logicmonitorexporter/go.sum +++ b/exporter/logicmonitorexporter/go.sum @@ -76,42 +76,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/logicmonitorexporter/logs_exporter.go b/exporter/logicmonitorexporter/logs_exporter.go index 751786cf5072..44ba752f4360 100644 --- a/exporter/logicmonitorexporter/logs_exporter.go +++ b/exporter/logicmonitorexporter/logs_exporter.go @@ -45,7 +45,7 @@ func newLogsExporter(_ context.Context, cfg component.Config, set exporter.Creat } func (e *logExporter) start(ctx context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return fmt.Errorf("failed to create http client: %w", err) } diff --git a/exporter/logicmonitorexporter/logs_exporter_test.go b/exporter/logicmonitorexporter/logs_exporter_test.go index a673cd0f8ec9..9531bb9afac3 100644 --- a/exporter/logicmonitorexporter/logs_exporter_test.go +++ b/exporter/logicmonitorexporter/logs_exporter_test.go @@ -38,7 +38,7 @@ func Test_NewLogsExporter(t *testing.T) { logger *zap.Logger }{ config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, @@ -68,7 +68,7 @@ func TestPushLogData(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, diff --git a/exporter/logicmonitorexporter/traces_exporter.go b/exporter/logicmonitorexporter/traces_exporter.go index 06912ab87b77..4f2866da4d77 100644 --- a/exporter/logicmonitorexporter/traces_exporter.go +++ b/exporter/logicmonitorexporter/traces_exporter.go @@ -33,7 +33,7 @@ func newTracesExporter(_ context.Context, cfg component.Config, set exporter.Cre } func (e *tracesExporter) start(ctx context.Context, host component.Host) error { - client, err := e.config.HTTPClientConfig.ToClient(host, e.settings) + client, err := e.config.ClientConfig.ToClient(host, e.settings) if err != nil { return fmt.Errorf("failed to create http client: %w", err) } diff --git a/exporter/logicmonitorexporter/traces_exporter_test.go b/exporter/logicmonitorexporter/traces_exporter_test.go index 0cec99b25a54..34fbd651ffd9 100644 --- a/exporter/logicmonitorexporter/traces_exporter_test.go +++ b/exporter/logicmonitorexporter/traces_exporter_test.go @@ -21,7 +21,7 @@ import ( func Test_NewTracesExporter(t *testing.T) { t.Run("should create Traces exporter", func(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.logicmonitor.com/rest", }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, @@ -45,7 +45,7 @@ func TestPushTraceData(t *testing.T) { params := exportertest.NewNopCreateSettings() f := NewFactory() config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, APIToken: APIToken{AccessID: "testid", AccessKey: "testkey"}, diff --git a/exporter/logzioexporter/config.go b/exporter/logzioexporter/config.go index d68949e8d7ea..d0d12bfacc8e 100644 --- a/exporter/logzioexporter/config.go +++ b/exporter/logzioexporter/config.go @@ -15,7 +15,7 @@ import ( // Config contains Logz.io specific configuration such as Account TracesToken, Region, etc. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // confighttp client settings https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp#HTTPClientConfig + confighttp.ClientConfig `mapstructure:",squash"` // confighttp client settings https://pkg.go.dev/go.opentelemetry.io/collector/config/confighttp#ClientConfig exporterhelper.QueueSettings `mapstructure:"sending_queue"` // exporter helper queue settings https://pkg.go.dev/go.opentelemetry.io/collector/exporter/exporterhelper#QueueSettings configretry.BackOffConfig `mapstructure:"retry_on_failure"` // exporter helper retry settings https://pkg.go.dev/go.opentelemetry.io/collector/exporter/exporterhelper#RetrySettings Token configopaque.String `mapstructure:"account_token"` // Your Logz.io Account Token, can be found at https://app.logz.io/#/dashboard/settings/general @@ -52,6 +52,6 @@ func (c *Config) checkAndWarnDeprecatedOptions(logger hclog.Logger) { if c.CustomEndpoint != "" { logger.Warn("You are using the deprecated `custom_endpoint` option that will be removed in the next release; please use `endpoint` configuration instead: https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp") logger.Warn("Mapping `custom_endpoint` -> `Endpoint`") - c.HTTPClientConfig.Endpoint = c.CustomEndpoint + c.ClientConfig.Endpoint = c.CustomEndpoint } } diff --git a/exporter/logzioexporter/config_test.go b/exporter/logzioexporter/config_test.go index 32b75ae74b99..380ce5179e8b 100644 --- a/exporter/logzioexporter/config_test.go +++ b/exporter/logzioexporter/config_test.go @@ -40,7 +40,7 @@ func TestLoadConfig(t *testing.T) { expected.BackOffConfig.MaxInterval = 5 * time.Second expected.QueueSettings = exporterhelper.NewDefaultQueueSettings() expected.QueueSettings.Enabled = false - expected.HTTPClientConfig = confighttp.HTTPClientConfig{ + expected.ClientConfig = confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -67,7 +67,7 @@ func TestDefaultLoadConfig(t *testing.T) { } expected.BackOffConfig = configretry.NewDefaultBackOffConfig() expected.QueueSettings = exporterhelper.NewDefaultQueueSettings() - expected.HTTPClientConfig = confighttp.HTTPClientConfig{ + expected.ClientConfig = confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -88,7 +88,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { CustomEndpoint: "https://api.example.com", QueueMaxLength: 10, DrainInterval: 10, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 10 * time.Second, Headers: map[string]configopaque.String{}, @@ -112,7 +112,7 @@ func TestCheckAndWarnDeprecatedOptions(t *testing.T) { DrainInterval: 10, BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://api.example.com", Timeout: 10 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/logzioexporter/exporter.go b/exporter/logzioexporter/exporter.go index 6fd0ec1daf9a..ac8f2ec6bd17 100644 --- a/exporter/logzioexporter/exporter.go +++ b/exporter/logzioexporter/exporter.go @@ -72,7 +72,7 @@ func newLogzioTracesExporter(config *Config, set exporter.CreateSettings) (expor if err != nil { return nil, err } - exporter.config.HTTPClientConfig.Endpoint, err = generateEndpoint(config) + exporter.config.ClientConfig.Endpoint, err = generateEndpoint(config) if err != nil { return nil, err } @@ -94,7 +94,7 @@ func newLogzioLogsExporter(config *Config, set exporter.CreateSettings) (exporte if err != nil { return nil, err } - exporter.config.HTTPClientConfig.Endpoint, err = generateEndpoint(config) + exporter.config.ClientConfig.Endpoint, err = generateEndpoint(config) if err != nil { return nil, err } @@ -113,7 +113,7 @@ func newLogzioLogsExporter(config *Config, set exporter.CreateSettings) (exporte } func (exporter *logzioExporter) start(_ context.Context, host component.Host) error { - client, err := exporter.config.HTTPClientConfig.ToClient(host, exporter.settings) + client, err := exporter.config.ClientConfig.ToClient(host, exporter.settings) if err != nil { return err } @@ -145,7 +145,7 @@ func (exporter *logzioExporter) pushLogData(ctx context.Context, ld plog.Logs) e } } } - err := exporter.export(ctx, exporter.config.HTTPClientConfig.Endpoint, dataBuffer.Bytes()) + err := exporter.export(ctx, exporter.config.ClientConfig.Endpoint, dataBuffer.Bytes()) // reset the data buffer after each export to prevent duplicated data dataBuffer.Reset() return err @@ -220,7 +220,7 @@ func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces ptrace } } } - err = exporter.export(ctx, exporter.config.HTTPClientConfig.Endpoint, dataBuffer.Bytes()) + err = exporter.export(ctx, exporter.config.ClientConfig.Endpoint, dataBuffer.Bytes()) // reset the data buffer after each export to prevent duplicated data dataBuffer.Reset() return err diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 116c11f9e34d..c55b886e683c 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -190,7 +190,7 @@ func TestExportErrors(tester *testing.T) { cfg := &Config{ Region: "", Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, }, } @@ -244,7 +244,7 @@ func TestPushTraceData(tester *testing.T) { cfg := Config{ Token: "token", Region: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, @@ -277,7 +277,7 @@ func TestPushLogsData(tester *testing.T) { cfg := Config{ Token: "token", Region: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, diff --git a/exporter/logzioexporter/factory.go b/exporter/logzioexporter/factory.go index 43d80763da96..d4a6f1bc98c2 100644 --- a/exporter/logzioexporter/factory.go +++ b/exporter/logzioexporter/factory.go @@ -39,7 +39,7 @@ func createDefaultConfig() component.Config { Token: "", BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, @@ -78,11 +78,11 @@ func getListenerURL(region string) string { func generateEndpoint(cfg *Config) (string, error) { defaultURL := fmt.Sprintf("%s/?token=%s", getListenerURL(""), string(cfg.Token)) switch { - case cfg.HTTPClientConfig.Endpoint != "": - return cfg.HTTPClientConfig.Endpoint, nil + case cfg.ClientConfig.Endpoint != "": + return cfg.ClientConfig.Endpoint, nil case cfg.Region != "": return fmt.Sprintf("%s/?token=%s", getListenerURL(cfg.Region), string(cfg.Token)), nil - case cfg.HTTPClientConfig.Endpoint == "" && cfg.Region == "": + case cfg.ClientConfig.Endpoint == "" && cfg.Region == "": return defaultURL, errors.New("failed to generate endpoint, Endpoint or Region must be set") default: return defaultURL, nil diff --git a/exporter/logzioexporter/factory_test.go b/exporter/logzioexporter/factory_test.go index aa4a5ad18b34..60624fa977cd 100644 --- a/exporter/logzioexporter/factory_test.go +++ b/exporter/logzioexporter/factory_test.go @@ -63,7 +63,7 @@ func TestGenerateUrl(t *testing.T) { cfg := &Config{ Region: test.region, Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: test.endpoint, }, } diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 7bcf1b50a984..a2da4cabf3fa 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -58,15 +58,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index c30fef55fe9e..38ac4acebdc4 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -93,44 +93,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/logzioexporter/jsonlog_test.go b/exporter/logzioexporter/jsonlog_test.go index 6bb3736b221b..3d092916153c 100644 --- a/exporter/logzioexporter/jsonlog_test.go +++ b/exporter/logzioexporter/jsonlog_test.go @@ -85,7 +85,7 @@ func TestSetTimeStamp(t *testing.T) { cfg := &Config{ Region: "us", Token: "token", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, Compression: configcompression.Gzip, }, diff --git a/exporter/lokiexporter/config.go b/exporter/lokiexporter/config.go index ef1894de4653..1ac225728286 100644 --- a/exporter/lokiexporter/config.go +++ b/exporter/lokiexporter/config.go @@ -14,7 +14,7 @@ import ( // Config defines configuration for Loki exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index dcbb62a9db97..bd0078f5ca5a 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfigNewExporter(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "X-Custom-Header": "loki_rocks", }, @@ -110,7 +110,7 @@ func TestConfigValidate(t *testing.T) { { desc: "Config is valid", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://loki.example.com", }, }, diff --git a/exporter/lokiexporter/exporter.go b/exporter/lokiexporter/exporter.go index 653e898d7fbb..862ae1142595 100644 --- a/exporter/lokiexporter/exporter.go +++ b/exporter/lokiexporter/exporter.go @@ -95,12 +95,12 @@ func (l *lokiExporter) sendPushRequest(ctx context.Context, tenant string, reque return consumererror.NewPermanent(err) } - req, err := http.NewRequestWithContext(ctx, "POST", l.config.HTTPClientConfig.Endpoint, bytes.NewReader(buf)) + req, err := http.NewRequestWithContext(ctx, "POST", l.config.ClientConfig.Endpoint, bytes.NewReader(buf)) if err != nil { return consumererror.NewPermanent(err) } - for k, v := range l.config.HTTPClientConfig.Headers { + for k, v := range l.config.ClientConfig.Headers { req.Header.Set(k, string(v)) } req.Header.Set("Content-Type", "application/x-protobuf") @@ -149,7 +149,7 @@ func encode(pb proto.Message) ([]byte, error) { } func (l *lokiExporter) start(_ context.Context, host component.Host) (err error) { - client, err := l.config.HTTPClientConfig.ToClient(host, l.settings) + client, err := l.config.ClientConfig.ToClient(host, l.settings) if err != nil { return err } diff --git a/exporter/lokiexporter/exporter_test.go b/exporter/lokiexporter/exporter_test.go index 388c52a3da6d..c2dfd7f751a0 100644 --- a/exporter/lokiexporter/exporter_test.go +++ b/exporter/lokiexporter/exporter_test.go @@ -76,7 +76,7 @@ func TestPushLogData(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, } @@ -255,7 +255,7 @@ func TestLogsToLokiRequestWithGroupingByTenant(t *testing.T) { defer ts.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, }, } diff --git a/exporter/lokiexporter/factory.go b/exporter/lokiexporter/factory.go index 44c01124fcd8..d82d0ee1355f 100644 --- a/exporter/lokiexporter/factory.go +++ b/exporter/lokiexporter/factory.go @@ -30,7 +30,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 30 * time.Second, Headers: map[string]configopaque.String{}, diff --git a/exporter/lokiexporter/factory_test.go b/exporter/lokiexporter/factory_test.go index 18ff2230db7e..90def8d7a17e 100644 --- a/exporter/lokiexporter/factory_test.go +++ b/exporter/lokiexporter/factory_test.go @@ -21,7 +21,7 @@ const ( func TestExporter_new(t *testing.T) { t.Run("with valid config", func(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } @@ -33,7 +33,7 @@ func TestExporter_new(t *testing.T) { func TestExporter_startReturnsNillWhenValidConfig(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } @@ -45,10 +45,10 @@ func TestExporter_startReturnsNillWhenValidConfig(t *testing.T) { func TestExporter_startReturnsErrorWhenInvalidHttpClientSettings(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { - return nil, fmt.Errorf("this causes HTTPClientConfig.ToClient() to error") + return nil, fmt.Errorf("this causes ClientConfig.ToClient() to error") }, }, } @@ -60,7 +60,7 @@ func TestExporter_startReturnsErrorWhenInvalidHttpClientSettings(t *testing.T) { func TestExporter_stopAlwaysReturnsNil(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: validEndpoint, }, } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 7288b30b8cf5..92f1ebd49cc7 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -11,16 +11,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.93.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -60,15 +60,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index c9adac6a34ef..82c2d0529921 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -103,44 +103,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/mezmoexporter/config.go b/exporter/mezmoexporter/config.go index 90273e86bee9..691f19f54094 100644 --- a/exporter/mezmoexporter/config.go +++ b/exporter/mezmoexporter/config.go @@ -33,7 +33,7 @@ const ( // Config defines configuration for Mezmo exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -45,8 +45,8 @@ type Config struct { } // returns default http client settings -func createDefaultHTTPClientConfig() confighttp.HTTPClientConfig { - return confighttp.HTTPClientConfig{ +func createDefaultClientConfig() confighttp.ClientConfig { + return confighttp.ClientConfig{ Timeout: defaultTimeout, } } diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index a9c79ebe441b..953ea71aa778 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -41,7 +41,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.BackOffConfig{ diff --git a/exporter/mezmoexporter/exporter.go b/exporter/mezmoexporter/exporter.go index dae85fadb94d..4c10b8c9ce72 100644 --- a/exporter/mezmoexporter/exporter.go +++ b/exporter/mezmoexporter/exporter.go @@ -59,7 +59,7 @@ func (m *mezmoExporter) pushLogData(_ context.Context, ld plog.Logs) error { } func (m *mezmoExporter) start(_ context.Context, host component.Host) (err error) { - m.client, err = m.config.HTTPClientConfig.ToClient(host, m.settings) + m.client, err = m.config.ClientConfig.ToClient(host, m.settings) return err } diff --git a/exporter/mezmoexporter/factory.go b/exporter/mezmoexporter/factory.go index 76e3dcec19ec..f771189aad26 100644 --- a/exporter/mezmoexporter/factory.go +++ b/exporter/mezmoexporter/factory.go @@ -27,10 +27,10 @@ func NewFactory() exporter.Factory { // Create a default Memzo config func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: createDefaultHTTPClientConfig(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: exporterhelper.NewDefaultQueueSettings(), - IngestURL: defaultIngestURL, + ClientConfig: createDefaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: exporterhelper.NewDefaultQueueSettings(), + IngestURL: defaultIngestURL, } } diff --git a/exporter/mezmoexporter/factory_test.go b/exporter/mezmoexporter/factory_test.go index da7e1530c2ed..e2eda355ae90 100644 --- a/exporter/mezmoexporter/factory_test.go +++ b/exporter/mezmoexporter/factory_test.go @@ -33,7 +33,7 @@ func TestCreateDefaultConfig(t *testing.T) { IngestURL: defaultIngestURL, IngestKey: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.NewDefaultBackOffConfig(), diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index a2792b47cd64..f5dcf6488c87 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -5,14 +5,14 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,17 +47,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/mezmoexporter/go.sum b/exporter/mezmoexporter/go.sum index e2aedf6110b2..6a405eb8bb79 100644 --- a/exporter/mezmoexporter/go.sum +++ b/exporter/mezmoexporter/go.sum @@ -72,44 +72,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index fb1e7a118861..7890a95609c0 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -12,9 +12,9 @@ import ( // Config defines configuration for OpenCensus exporter. type Config struct { - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - exporterhelper.QueueSettings `mapstructure:"sending_queue"` - configretry.BackOffConfig `mapstructure:"retry_on_failure"` + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + exporterhelper.QueueSettings `mapstructure:"sending_queue"` + configretry.BackOffConfig `mapstructure:"retry_on_failure"` // The number of workers that send the gRPC requests. NumWorkers int `mapstructure:"num_workers"` diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 8d4f2be346b5..5e80135b8291 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index 1d6f94c3e275..4cf079f447dc 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -26,7 +26,7 @@ func NewFactory() exporter.Factory { func createDefaultConfig() component.Config { return &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ // We almost read 0 bytes, so no need to tune ReadBufferSize. WriteBufferSize: 512 * 1024, }, diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 67e4f4a7d3f7..54f8409442e2 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -37,7 +37,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoEndpoint", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumWorkers: 3, @@ -47,7 +47,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZeroNumWorkers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -60,7 +60,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -72,7 +72,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "gzip", }, @@ -96,7 +96,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -109,7 +109,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "unknown compression", }, @@ -121,7 +121,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -135,7 +135,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index 8d81e61f3666..ed53bdf25fd3 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -9,16 +9,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -59,16 +59,16 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 72b505258428..dc8b804dbfea 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -122,46 +122,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index 530241478abc..0cedb5130ab6 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -64,7 +64,7 @@ func newOcExporter(_ context.Context, cfg *Config, settings component.TelemetryS metadata: metadata.New(nil), settings: settings, } - for k, v := range cfg.GRPCClientSettings.Headers { + for k, v := range cfg.ClientConfig.Headers { oce.metadata.Set(k, string(v)) } return oce, nil @@ -72,7 +72,7 @@ func newOcExporter(_ context.Context, cfg *Config, settings component.TelemetryS // start creates the gRPC client Connection func (oce *ocExporter) start(ctx context.Context, host component.Host) error { - clientConn, err := oce.cfg.GRPCClientSettings.ToClientConn(ctx, host, oce.settings) + clientConn, err := oce.cfg.ClientConfig.ToClientConn(ctx, host, oce.settings) if err != nil { return err } diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 11f5a403893a..947c632bbb95 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -28,7 +28,7 @@ func TestSendTraces(t *testing.T) { rFactory := opencensusreceiver.NewFactory() rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) - rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint + rCfg.ServerConfig.NetAddr.Endpoint = endpoint set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateTracesReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) @@ -39,7 +39,7 @@ func TestSendTraces(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -81,7 +81,7 @@ func TestSendTraces(t *testing.T) { func TestSendTraces_NoBackend(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -105,7 +105,7 @@ func TestSendTraces_NoBackend(t *testing.T) { func TestSendTraces_AfterStop(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -127,7 +127,7 @@ func TestSendMetrics(t *testing.T) { rFactory := opencensusreceiver.NewFactory() rCfg := rFactory.CreateDefaultConfig().(*opencensusreceiver.Config) endpoint := testutil.GetAvailableLocalAddress(t) - rCfg.GRPCServerSettings.NetAddr.Endpoint = endpoint + rCfg.ServerConfig.NetAddr.Endpoint = endpoint set := receivertest.NewNopCreateSettings() recv, err := rFactory.CreateMetricsReceiver(context.Background(), set, rCfg, sink) assert.NoError(t, err) @@ -138,7 +138,7 @@ func TestSendMetrics(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -178,7 +178,7 @@ func TestSendMetrics(t *testing.T) { func TestSendMetrics_NoBackend(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -202,7 +202,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { func TestSendMetrics_AfterStop(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ + cfg.ClientConfig = configgrpc.ClientConfig{ Endpoint: "localhost:56569", TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/opensearchexporter/config.go b/exporter/opensearchexporter/config.go index d17737480bd1..c8546a6d407a 100644 --- a/exporter/opensearchexporter/config.go +++ b/exporter/opensearchexporter/config.go @@ -28,7 +28,7 @@ const ( // Config defines configuration for OpenSearch exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:"http"` + confighttp.ClientConfig `mapstructure:"http"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` exporterhelper.TimeoutSettings `mapstructure:",squash"` MappingsSettings `mapstructure:"mapping"` diff --git a/exporter/opensearchexporter/config_test.go b/exporter/opensearchexporter/config_test.go index 7cf63ecbcb41..f974ad004f2f 100644 --- a/exporter/opensearchexporter/config_test.go +++ b/exporter/opensearchexporter/config_test.go @@ -49,7 +49,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ Dataset: "ngnix", Namespace: "eu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: sampleEndpoint, Timeout: 2 * time.Minute, Headers: map[string]configopaque.String{ diff --git a/exporter/opensearchexporter/factory.go b/exporter/opensearchexporter/factory.go index 3a7e03561911..75a74580f7f0 100644 --- a/exporter/opensearchexporter/factory.go +++ b/exporter/opensearchexporter/factory.go @@ -30,7 +30,7 @@ func NewFactory() exporter.Factory { func newDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), Dataset: defaultDataset, Namespace: defaultNamespace, BulkAction: defaultBulkAction, diff --git a/exporter/opensearchexporter/go.mod b/exporter/opensearchexporter/go.mod index b4a4b9e925e0..1e56b4b6a8a2 100644 --- a/exporter/opensearchexporter/go.mod +++ b/exporter/opensearchexporter/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/opensearch-project/opensearch-go/v2 v2.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -58,15 +58,15 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 diff --git a/exporter/opensearchexporter/go.sum b/exporter/opensearchexporter/go.sum index 7c0c4a54f8a7..2d9bd01eac08 100644 --- a/exporter/opensearchexporter/go.sum +++ b/exporter/opensearchexporter/go.sum @@ -100,42 +100,42 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/opensearchexporter/sso_log_exporter.go b/exporter/opensearchexporter/sso_log_exporter.go index bda030a09d88..ba515222de2f 100644 --- a/exporter/opensearchexporter/sso_log_exporter.go +++ b/exporter/opensearchexporter/sso_log_exporter.go @@ -19,7 +19,7 @@ type logExporter struct { Index string bulkAction string model mappingModel - httpSettings confighttp.HTTPClientConfig + httpSettings confighttp.ClientConfig telemetry component.TelemetrySettings } @@ -43,7 +43,7 @@ func newLogExporter(cfg *Config, set exporter.CreateSettings) (*logExporter, err telemetry: set.TelemetrySettings, Index: getIndexName(cfg.Dataset, cfg.Namespace, cfg.LogsIndex), bulkAction: cfg.BulkAction, - httpSettings: cfg.HTTPClientConfig, + httpSettings: cfg.ClientConfig, model: model, }, nil } diff --git a/exporter/opensearchexporter/sso_trace_exporter.go b/exporter/opensearchexporter/sso_trace_exporter.go index f0f1aee5ae7d..8742793fc3a1 100644 --- a/exporter/opensearchexporter/sso_trace_exporter.go +++ b/exporter/opensearchexporter/sso_trace_exporter.go @@ -21,7 +21,7 @@ type ssoTracesExporter struct { Dataset string bulkAction string model mappingModel - httpSettings confighttp.HTTPClientConfig + httpSettings confighttp.ClientConfig telemetry component.TelemetrySettings } @@ -41,7 +41,7 @@ func newSSOTracesExporter(cfg *Config, set exporter.CreateSettings) (*ssoTracesE Dataset: cfg.Dataset, bulkAction: cfg.BulkAction, model: model, - httpSettings: cfg.HTTPClientConfig, + httpSettings: cfg.ClientConfig, }, nil } diff --git a/exporter/otelarrowexporter/config.go b/exporter/otelarrowexporter/config.go index c19fd270d7da..213cbbe39740 100644 --- a/exporter/otelarrowexporter/config.go +++ b/exporter/otelarrowexporter/config.go @@ -28,7 +28,7 @@ type Config struct { RetrySettings configretry.BackOffConfig `mapstructure:"retry_on_failure"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // Arrow includes settings specific to OTel Arrow. Arrow ArrowSettings `mapstructure:"arrow"` diff --git a/exporter/otelarrowexporter/config_test.go b/exporter/otelarrowexporter/config_test.go index 9d0c9e4e57d7..2b4e898656b1 100644 --- a/exporter/otelarrowexporter/config_test.go +++ b/exporter/otelarrowexporter/config_test.go @@ -31,7 +31,7 @@ func TestUnmarshalDefaultConfig(t *testing.T) { cfg := factory.CreateDefaultConfig() assert.NoError(t, component.UnmarshalConfig(cm, cfg)) assert.Equal(t, factory.CreateDefaultConfig(), cfg) - assert.Equal(t, "round_robin", cfg.(*Config).GRPCClientSettings.BalancerName) + assert.Equal(t, "round_robin", cfg.(*Config).ClientConfig.BalancerName) } func TestUnmarshalConfig(t *testing.T) { @@ -58,7 +58,7 @@ func TestUnmarshalConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", diff --git a/exporter/otelarrowexporter/factory.go b/exporter/otelarrowexporter/factory.go index 0fd54f3b892a..bfbb6a03c30e 100644 --- a/exporter/otelarrowexporter/factory.go +++ b/exporter/otelarrowexporter/factory.go @@ -42,7 +42,7 @@ func createDefaultConfig() component.Config { RetrySettings: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{}, // Default to zstd compression Compression: configcompression.Zstd, diff --git a/exporter/otelarrowexporter/factory_test.go b/exporter/otelarrowexporter/factory_test.go index 6fbf626f2d0f..3b6304c1996d 100644 --- a/exporter/otelarrowexporter/factory_test.go +++ b/exporter/otelarrowexporter/factory_test.go @@ -47,7 +47,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateMetricsExporter(context.Background(), set, cfg) @@ -66,7 +66,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoEndpoint", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, }, @@ -75,7 +75,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -99,7 +99,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NoneCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "none", }, @@ -108,7 +108,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "GzipCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Gzip, }, @@ -117,7 +117,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "SnappyCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Snappy, }, @@ -126,7 +126,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "ZstdCompression", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: configcompression.Zstd, }, @@ -135,7 +135,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -147,7 +147,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "NumConsumers", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, }, }, @@ -155,7 +155,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -168,7 +168,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -213,7 +213,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateLogsExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) set := exportertest.NewNopCreateSettings() oexp, err := factory.CreateLogsExporter(context.Background(), set, cfg) @@ -224,7 +224,7 @@ func TestCreateLogsExporter(t *testing.T) { func TestCreateArrowTracesExporter(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.GRPCClientSettings.Endpoint = testutil.GetAvailableLocalAddress(t) + cfg.ClientConfig.Endpoint = testutil.GetAvailableLocalAddress(t) cfg.Arrow = ArrowSettings{ NumStreams: 1, } diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index 891c1ea28c5e..eb828e256a77 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -6,17 +6,17 @@ require ( github.com/open-telemetry/otel-arrow v0.16.0 github.com/open-telemetry/otel-arrow/collector v0.16.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -68,17 +68,17 @@ require ( github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index 5495b86a1479..7f0a13dcbb63 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -157,50 +157,50 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/exporter/otelarrowexporter/otelarrow.go b/exporter/otelarrowexporter/otelarrow.go index 4a6d167083b8..c1e689e3c01a 100644 --- a/exporter/otelarrowexporter/otelarrow.go +++ b/exporter/otelarrowexporter/otelarrow.go @@ -51,7 +51,7 @@ func newExporter(cfg component.Config, set exporter.CreateSettings, _ streamClie func (e *baseExporter) start(ctx context.Context, host component.Host) (err error) { // TODO: Implementation: the following is a placeholder used // to satisfy gRPC configuration-related configuration errors. - if _, err = e.config.GRPCClientSettings.ToClientConn(ctx, host, e.settings.TelemetrySettings); err != nil { + if _, err = e.config.ClientConfig.ToClientConn(ctx, host, e.settings.TelemetrySettings); err != nil { return err } return nil diff --git a/exporter/prometheusexporter/README.md b/exporter/prometheusexporter/README.md index 0e5686fb93c7..85c95358349c 100644 --- a/exporter/prometheusexporter/README.md +++ b/exporter/prometheusexporter/README.md @@ -25,7 +25,7 @@ Exports data in the [Prometheus format](https://prometheus.io/docs/concepts/data The following settings are required: -- `endpoint` (no default): the address on which metrics will be exposed, using path `/metrics`. For full list of `HTTPServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). +- `endpoint` (no default): the address on which metrics will be exposed, using path `/metrics`. For full list of `ServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The following settings can be optionally configured: diff --git a/exporter/prometheusexporter/config.go b/exporter/prometheusexporter/config.go index 04172110191d..811823e734e5 100644 --- a/exporter/prometheusexporter/config.go +++ b/exporter/prometheusexporter/config.go @@ -15,7 +15,7 @@ import ( // Config defines configuration for Prometheus exporter. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // Namespace if set, exports metrics under the provided value. Namespace string `mapstructure:"namespace"` diff --git a/exporter/prometheusexporter/config_test.go b/exporter/prometheusexporter/config_test.go index 98c153d839c5..833a1a123776 100644 --- a/exporter/prometheusexporter/config_test.go +++ b/exporter/prometheusexporter/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "2"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "1.2.3.4:1234", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/prometheusexporter/end_to_end_test.go b/exporter/prometheusexporter/end_to_end_test.go index 96f745859d1b..9f667e82fe72 100644 --- a/exporter/prometheusexporter/end_to_end_test.go +++ b/exporter/prometheusexporter/end_to_end_test.go @@ -57,7 +57,7 @@ func TestEndToEndSummarySupport(t *testing.T) { // 2. Create the Prometheus metrics exporter that'll receive and verify the metrics produced. exporterCfg := &Config{ Namespace: "test", - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8787", }, SendTimestamps: true, diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index d880e5680337..25778eb1ceba 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -11,15 +11,15 @@ require ( github.com/prometheus/client_model v0.5.0 github.com/prometheus/common v0.46.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -136,16 +136,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index d12d086e8373..97d1250963fb 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -519,49 +519,49 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 84366967d385..763f3a34fef2 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -39,7 +39,7 @@ func TestPrometheusExporter(t *testing.T) { "foo0": "bar0", "code0": "one0", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8999", }, SendTimestamps: false, @@ -48,7 +48,7 @@ func TestPrometheusExporter(t *testing.T) { }, { config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:88999", }, }, @@ -96,7 +96,7 @@ func TestPrometheusExporter_WithTLS(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -181,7 +181,7 @@ func TestPrometheusExporter_endToEndMultipleTargets(t *testing.T) { "foo1": "bar1", "code1": "one1", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, MetricExpiration: 120 * time.Minute, @@ -263,7 +263,7 @@ func TestPrometheusExporter_endToEnd(t *testing.T) { "foo1": "bar1", "code1": "one1", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, MetricExpiration: 120 * time.Minute, @@ -339,7 +339,7 @@ func TestPrometheusExporter_endToEndWithTimestamps(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, SendTimestamps: true, @@ -416,7 +416,7 @@ func TestPrometheusExporter_endToEndWithResource(t *testing.T) { "foo2": "bar2", "code2": "one2", }, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:7777", }, SendTimestamps: true, diff --git a/exporter/prometheusremotewriteexporter/config.go b/exporter/prometheusremotewriteexporter/config.go index 238e5fc8bf9d..f63468783b1f 100644 --- a/exporter/prometheusremotewriteexporter/config.go +++ b/exporter/prometheusremotewriteexporter/config.go @@ -30,7 +30,7 @@ type Config struct { // ExternalLabels defines a map of label keys and values that are allowed to start with reserved prefix "__" ExternalLabels map[string]string `mapstructure:"external_labels"` - HTTPClientConfig confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + ClientConfig confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // maximum size in bytes of time series batch sent to remote storage MaxBatchSizeBytes int `mapstructure:"max_batch_size_bytes"` diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 7db787d6cc9a..8b6b7345fe77 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -59,7 +59,7 @@ func TestLoadConfig(t *testing.T) { AddMetricSuffixes: false, Namespace: "test-space", ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8888", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/prometheusremotewriteexporter/exporter.go b/exporter/prometheusremotewriteexporter/exporter.go index b095bb1d8102..7833efac299d 100644 --- a/exporter/prometheusremotewriteexporter/exporter.go +++ b/exporter/prometheusremotewriteexporter/exporter.go @@ -40,7 +40,7 @@ type prwExporter struct { concurrency int userAgentHeader string maxBatchSizeBytes int - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig settings component.TelemetrySettings retrySettings configretry.BackOffConfig wal *prweWAL @@ -54,7 +54,7 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err return nil, err } - endpointURL, err := url.ParseRequestURI(cfg.HTTPClientConfig.Endpoint) + endpointURL, err := url.ParseRequestURI(cfg.ClientConfig.Endpoint) if err != nil { return nil, errors.New("invalid endpoint") } @@ -68,7 +68,7 @@ func newPRWExporter(cfg *Config, set exporter.CreateSettings) (*prwExporter, err userAgentHeader: userAgentHeader, maxBatchSizeBytes: cfg.MaxBatchSizeBytes, concurrency: cfg.RemoteWriteQueue.NumConsumers, - clientSettings: &cfg.HTTPClientConfig, + clientSettings: &cfg.ClientConfig, settings: set.TelemetrySettings, retrySettings: cfg.BackOffConfig, exporterSettings: prometheusremotewrite.Settings{ diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index a9bd7e1d8481..ca146d84ff5a 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -36,11 +36,11 @@ import ( // Test_NewPRWExporter checks that a new exporter instance with non-nil fields is initialized func Test_NewPRWExporter(t *testing.T) { cfg := &Config{ - TimeoutSettings: exporterhelper.TimeoutSettings{}, - BackOffConfig: configretry.BackOffConfig{}, - Namespace: "", - ExternalLabels: map[string]string{}, - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ""}, + TimeoutSettings: exporterhelper.TimeoutSettings{}, + BackOffConfig: configretry.BackOffConfig{}, + Namespace: "", + ExternalLabels: map[string]string{}, + ClientConfig: confighttp.ClientConfig{Endpoint: ""}, TargetInfo: &TargetInfo{ Enabled: true, }, @@ -107,7 +107,7 @@ func Test_NewPRWExporter(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - cfg.HTTPClientConfig.Endpoint = tt.endpoint + cfg.ClientConfig.Endpoint = tt.endpoint cfg.ExternalLabels = tt.externalLabels cfg.Namespace = tt.namespace cfg.RemoteWriteQueue.NumConsumers = 1 @@ -159,7 +159,7 @@ func Test_Start(t *testing.T) { returnErrorOnStartUp bool set exporter.CreateSettings endpoint string - clientSettings confighttp.HTTPClientConfig + clientSettings confighttp.ClientConfig }{ { name: "success_case", @@ -168,7 +168,7 @@ func Test_Start(t *testing.T) { concurrency: 5, externalLabels: map[string]string{"Key1": "Val1"}, set: set, - clientSettings: confighttp.HTTPClientConfig{Endpoint: "https://some.url:9411/api/prom/push"}, + clientSettings: confighttp.ClientConfig{Endpoint: "https://some.url:9411/api/prom/push"}, }, { name: "invalid_tls", @@ -178,7 +178,7 @@ func Test_Start(t *testing.T) { externalLabels: map[string]string{"Key1": "Val1"}, set: set, returnErrorOnStartUp: true, - clientSettings: confighttp.HTTPClientConfig{ + clientSettings: confighttp.ClientConfig{ Endpoint: "https://some.url:9411/api/prom/push", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -198,7 +198,7 @@ func Test_Start(t *testing.T) { cfg.ExternalLabels = tt.externalLabels cfg.Namespace = tt.namespace cfg.RemoteWriteQueue.NumConsumers = 1 - cfg.HTTPClientConfig = tt.clientSettings + cfg.ClientConfig = tt.clientSettings prwe, err := newPRWExporter(cfg, tt.set) assert.NoError(t, err) @@ -344,7 +344,7 @@ func runExportPipeline(ts *prompb.TimeSeries, endpoint *url.URL) error { } cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = endpoint.String() + cfg.ClientConfig.Endpoint = endpoint.String() cfg.RemoteWriteQueue.NumConsumers = 1 cfg.BackOffConfig = configretry.BackOffConfig{ Enabled: true, @@ -686,7 +686,7 @@ func Test_PushMetrics(t *testing.T) { } cfg := &Config{ Namespace: "", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: server.URL, // We almost read 0 bytes, so no need to tune ReadBufferSize. ReadBufferSize: 0, @@ -872,7 +872,7 @@ func TestWALOnExporterRoundTrip(t *testing.T) { tempDir := t.TempDir() cfg := &Config{ Namespace: "test_ns", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: prweServer.URL, }, RemoteWriteQueue: RemoteWriteQueue{NumConsumers: 1}, diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index f874a1797ddb..d0a0f8555513 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -78,7 +78,7 @@ func createDefaultConfig() component.Config { BackOffConfig: retrySettings, AddMetricSuffixes: true, SendMetadata: false, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://some.url:9411/api/prom/push", // We almost read 0 bytes, so no need to tune ReadBufferSize. ReadBufferSize: 0, diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index 026242c57eac..1559b37bd19a 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -27,9 +27,9 @@ func Test_createDefaultConfig(t *testing.T) { func Test_createMetricsExporter(t *testing.T) { invalidConfig := createDefaultConfig().(*Config) - invalidConfig.HTTPClientConfig = confighttp.HTTPClientConfig{} + invalidConfig.ClientConfig = confighttp.ClientConfig{} invalidTLSConfig := createDefaultConfig().(*Config) - invalidTLSConfig.HTTPClientConfig.TLSSetting = configtls.TLSClientSetting{ + invalidTLSConfig.ClientConfig.TLSSetting = configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "non-existent file", CertFile: "", diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index 108ac117aabf..5c68e41c50e6 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -14,15 +14,15 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 github.com/tidwall/wal v1.1.7 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,16 +58,16 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/tinylru v1.1.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index dfd0577b97f8..5eaceae3e6a3 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -86,44 +86,44 @@ 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/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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index e7f66d7d247c..70978e7f379d 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -68,10 +68,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/pulsarexporter/go.sum b/exporter/pulsarexporter/go.sum index 8fdb5f3f4d68..29ae3dfad16b 100644 --- a/exporter/pulsarexporter/go.sum +++ b/exporter/pulsarexporter/go.sum @@ -413,30 +413,30 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index e3b079d950a4..bde3c6932851 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -12,13 +12,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,11 +50,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 05c142bcfb34..189b25320995 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -109,30 +109,30 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 709fb908aac4..f2f69bb95646 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,12 +40,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 1367ed7489b7..e35dbf24b4b5 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -66,28 +66,28 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/signalfxexporter/config.go b/exporter/signalfxexporter/config.go index 66a349a79d99..4984033c7475 100644 --- a/exporter/signalfxexporter/config.go +++ b/exporter/signalfxexporter/config.go @@ -52,7 +52,7 @@ var _ confmap.Unmarshaler = (*Config)(nil) type Config struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. // AccessToken is the authentication token provided by SignalFx. AccessToken configopaque.String `mapstructure:"access_token"` @@ -220,7 +220,7 @@ func (cfg *Config) Validate() error { ` "ingest_url" and "api_url" should be explicitly set`) } - if cfg.HTTPClientConfig.Timeout < 0 { + if cfg.ClientConfig.Timeout < 0 { return errors.New(`cannot have a negative "timeout"`) } diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 92cf300da67b..a9d359eed023 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -48,7 +48,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AccessToken: "testToken", Realm: "ap0", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Headers: nil, MaxIdleConns: &hundred, @@ -85,7 +85,7 @@ func TestLoadConfig(t *testing.T) { DeltaTranslationTTL: 3600, ExcludeProperties: nil, Correlation: &correlation.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 5 * time.Second, }, @@ -111,7 +111,7 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ AccessToken: "testToken", Realm: "us1", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 2 * time.Second, Headers: map[string]configopaque.String{ "added-entry": "added value", @@ -244,7 +244,7 @@ func TestLoadConfig(t *testing.T) { }, }, Correlation: &correlation.Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "", Timeout: 5 * time.Second, }, @@ -494,9 +494,9 @@ func TestConfigValidateErrors(t *testing.T) { { name: "Negative Timeout", cfg: &Config{ - Realm: "us0", - AccessToken: "access_token", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: -1 * time.Second}, + Realm: "us0", + AccessToken: "access_token", + ClientConfig: confighttp.ClientConfig{Timeout: -1 * time.Second}, }, }, { diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index bce338737076..becef412f203 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -214,7 +214,7 @@ func (se *signalfxExporter) startLogs(_ context.Context, host component.Host) er } func (se *signalfxExporter) createClient(host component.Host) (*http.Client, error) { - se.config.HTTPClientConfig.TLSSetting = se.config.IngestTLSSettings + se.config.ClientConfig.TLSSetting = se.config.IngestTLSSettings return se.config.ToClient(host, se.telemetrySettings) } @@ -260,11 +260,11 @@ func buildHeaders(config *Config, version string) map[string]string { // Add any custom headers from the config. They will override the pre-defined // ones above in case of conflict, but, not the content encoding one since // the latter one is defined according to the payload. - for k, v := range config.HTTPClientConfig.Headers { + for k, v := range config.ClientConfig.Headers { headers[k] = string(v) } // we want to control how headers are set, overriding user headers with our passthrough. - config.HTTPClientConfig.Headers = nil + config.ClientConfig.Headers = nil return headers } diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 05e67dd0ffce..a985b15331d2 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -67,9 +67,9 @@ func TestNew(t *testing.T) { { name: "successfully create exporter", config: &Config{ - AccessToken: "someToken", - Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + AccessToken: "someToken", + Realm: "xyz", + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, }, }, { @@ -77,7 +77,7 @@ func TestNew(t *testing.T) { config: &Config{ AccessToken: "someToken", Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, SyncHostMetadata: true, }, }, @@ -180,7 +180,7 @@ func TestConsumeMetrics(t *testing.T) { assert.NoError(t, err) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 1 * time.Second, Headers: map[string]configopaque.String{"test_header_": "test"}, }, @@ -402,11 +402,11 @@ func TestConsumeMetricsWithAccessTokenPassthrough(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.IngestURL = server.URL cfg.APIURL = server.URL - cfg.HTTPClientConfig.Headers = make(map[string]configopaque.String) + cfg.ClientConfig.Headers = make(map[string]configopaque.String) for k, v := range tt.additionalHeaders { - cfg.HTTPClientConfig.Headers[k] = configopaque.String(v) + cfg.ClientConfig.Headers[k] = configopaque.String(v) } - cfg.HTTPClientConfig.Headers["test_header_"] = configopaque.String(tt.name) + cfg.ClientConfig.Headers["test_header_"] = configopaque.String(tt.name) cfg.AccessToken = configopaque.String(fromHeaders) cfg.AccessTokenPassthrough = tt.accessTokenPassthrough sfxExp, err := NewFactory().CreateMetricsExporter(context.Background(), exportertest.NewNopCreateSettings(), cfg) @@ -441,9 +441,9 @@ func TestNewEventExporter(t *testing.T) { assert.Nil(t, got) cfg := &Config{ - AccessToken: "someToken", - Realm: "xyz", - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 1 * time.Second}, + AccessToken: "someToken", + Realm: "xyz", + ClientConfig: confighttp.ClientConfig{Timeout: 1 * time.Second}, } got, err = newEventExporter(cfg, exportertest.NewNopCreateSettings()) @@ -557,7 +557,7 @@ func TestConsumeEventData(t *testing.T) { assert.NoError(t, err) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 1 * time.Second, Headers: map[string]configopaque.String{"test_header_": "test"}, }, diff --git a/exporter/signalfxexporter/factory.go b/exporter/signalfxexporter/factory.go index f6d573212112..1410dd452a2b 100644 --- a/exporter/signalfxexporter/factory.go +++ b/exporter/signalfxexporter/factory.go @@ -54,7 +54,7 @@ func createDefaultConfig() component.Config { return &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, MaxIdleConns: &maxConnCount, MaxIdleConnsPerHost: &maxConnCount, @@ -88,17 +88,17 @@ func createTracesExporter( cfg := eCfg.(*Config) corrCfg := cfg.Correlation - if corrCfg.HTTPClientConfig.Endpoint == "" { + if corrCfg.ClientConfig.Endpoint == "" { apiURL, err := cfg.getAPIURL() if err != nil { return nil, fmt.Errorf("unable to create API URL: %w", err) } - corrCfg.HTTPClientConfig.Endpoint = apiURL.String() + corrCfg.ClientConfig.Endpoint = apiURL.String() } if cfg.AccessToken == "" { return nil, errors.New("access_token is required") } - set.Logger.Info("Correlation tracking enabled", zap.String("endpoint", corrCfg.HTTPClientConfig.Endpoint)) + set.Logger.Info("Correlation tracking enabled", zap.String("endpoint", corrCfg.ClientConfig.Endpoint)) tracker := correlation.NewTracker(corrCfg, cfg.AccessToken, set) return exporterhelper.NewTracesExporter( diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 9b025e522711..5d811319529d 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -102,7 +102,7 @@ func TestCreateMetricsExporter_CustomConfig(t *testing.T) { config := &Config{ AccessToken: "testToken", Realm: "us1", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 2 * time.Second, Headers: map[string]configopaque.String{ "added-entry": "added value", diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index d5edbd4f5c49..552b0166f2cb 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -16,16 +16,16 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -70,15 +70,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 1dbba57c7e08..7e233b0d2ab9 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -111,44 +111,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/signalfxexporter/internal/correlation/config.go b/exporter/signalfxexporter/internal/correlation/config.go index d3462b37d937..72e20ffa6854 100644 --- a/exporter/signalfxexporter/internal/correlation/config.go +++ b/exporter/signalfxexporter/internal/correlation/config.go @@ -17,7 +17,7 @@ import ( // DefaultConfig returns default configuration correlation values. func DefaultConfig() *Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: 5 * time.Second}, + ClientConfig: confighttp.ClientConfig{Timeout: 5 * time.Second}, StaleServiceTimeout: 5 * time.Minute, SyncAttributes: map[string]string{ conventions.AttributeK8SPodUID: conventions.AttributeK8SPodUID, @@ -36,8 +36,8 @@ func DefaultConfig() *Config { // Config defines configuration for correlation via traces. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - correlations.Config `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` + correlations.Config `mapstructure:",squash"` // How long to wait after a trace span's service name is last seen before // uncorrelating that service. @@ -47,11 +47,11 @@ type Config struct { } func (c *Config) validate() error { - if c.HTTPClientConfig.Endpoint == "" { + if c.ClientConfig.Endpoint == "" { return errors.New("`correlation.endpoint` not specified") } - _, err := url.Parse(c.HTTPClientConfig.Endpoint) + _, err := url.Parse(c.ClientConfig.Endpoint) if err != nil { return err } diff --git a/exporter/signalfxexporter/internal/correlation/config_test.go b/exporter/signalfxexporter/internal/correlation/config_test.go index 60961ccb0ab8..78e4ec71846f 100644 --- a/exporter/signalfxexporter/internal/correlation/config_test.go +++ b/exporter/signalfxexporter/internal/correlation/config_test.go @@ -12,7 +12,7 @@ import ( func TestValidConfig(t *testing.T) { config := DefaultConfig() - config.HTTPClientConfig.Endpoint = "https://localhost" + config.ClientConfig.Endpoint = "https://localhost" require.NoError(t, config.validate()) } @@ -22,7 +22,7 @@ func TestInvalidConfig(t *testing.T) { require.Error(t, noEndpointErr) invalid = Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: ":123:456"}, + ClientConfig: confighttp.ClientConfig{Endpoint: ":123:456"}, } invalidURLErr := invalid.validate() require.Error(t, invalidURLErr) diff --git a/exporter/signalfxexporter/internal/correlation/correlation.go b/exporter/signalfxexporter/internal/correlation/correlation.go index ec4d4eae8dfb..223dd04b5261 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation.go +++ b/exporter/signalfxexporter/internal/correlation/correlation.go @@ -51,9 +51,9 @@ func NewTracker(cfg *Config, accessToken configopaque.String, params exporter.Cr func newCorrelationClient(cfg *Config, accessToken configopaque.String, params exporter.CreateSettings, host component.Host) ( *correlationContext, error, ) { - corrURL, err := url.Parse(cfg.HTTPClientConfig.Endpoint) + corrURL, err := url.Parse(cfg.ClientConfig.Endpoint) if err != nil { - return nil, fmt.Errorf("failed to parse correlation endpoint URL %q: %w", cfg.HTTPClientConfig.Endpoint, err) + return nil, fmt.Errorf("failed to parse correlation endpoint URL %q: %w", cfg.ClientConfig.Endpoint, err) } httpClient, err := cfg.ToClient(host, params.TelemetrySettings) diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index 398ad7567dab..4ba47000d3bf 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -54,7 +54,7 @@ func TestTrackerStart(t *testing.T) { { name: "invalid http client settings fails", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/skywalkingexporter/config.go b/exporter/skywalkingexporter/config.go index f0354ab59698..dbe20d0c43bf 100644 --- a/exporter/skywalkingexporter/config.go +++ b/exporter/skywalkingexporter/config.go @@ -14,7 +14,7 @@ import ( // Config defines configuration for SkyWalking exporter. type Config struct { - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` exporterhelper.TimeoutSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 689e3fcc8e02..3f53ff4356bc 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -58,7 +58,7 @@ func TestLoadConfig(t *testing.T) { TimeoutSettings: exporterhelper.TimeoutSettings{ Timeout: 10 * time.Second, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Headers: map[string]configopaque.String{ "can you have a . here?": "F0000000-0000-0000-0000-000000000000", "header1": "234", @@ -102,7 +102,7 @@ func TestLoadConfig(t *testing.T) { func TestValidate(t *testing.T) { c1 := &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumStreams: 3, @@ -110,7 +110,7 @@ func TestValidate(t *testing.T) { err := c1.Validate() assert.Error(t, err) c2 := &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "", }, NumStreams: 0, diff --git a/exporter/skywalkingexporter/factory.go b/exporter/skywalkingexporter/factory.go index 5578af1a8937..61f1758e8d32 100644 --- a/exporter/skywalkingexporter/factory.go +++ b/exporter/skywalkingexporter/factory.go @@ -30,7 +30,7 @@ func createDefaultConfig() component.Config { BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ // We almost read 0 bytes, so no need to tune ReadBufferSize. WriteBufferSize: 512 * 1024, }, diff --git a/exporter/skywalkingexporter/factory_test.go b/exporter/skywalkingexporter/factory_test.go index b6db58283d42..e5f5880e3015 100644 --- a/exporter/skywalkingexporter/factory_test.go +++ b/exporter/skywalkingexporter/factory_test.go @@ -37,7 +37,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "UseSecure", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -49,7 +49,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Keepalive", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Keepalive: &configgrpc.KeepaliveClientConfig{ Time: 30 * time.Second, @@ -63,7 +63,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Compression", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "gzip", }, @@ -73,7 +73,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "Headers", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Headers: map[string]configopaque.String{ "hdr1": "val1", @@ -86,7 +86,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CompressionError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, Compression: "unknown compression", }, @@ -98,7 +98,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CaCert", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -113,7 +113,7 @@ func TestCreateTracesExporter(t *testing.T) { { name: "CertPemFileError", config: &Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: endpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index a62a257217ff..d3303bfcbd63 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -7,16 +7,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 google.golang.org/grpc v1.61.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/skywalkingexporter/go.sum b/exporter/skywalkingexporter/go.sum index fd1bef26ff9b..10e7974539ca 100644 --- a/exporter/skywalkingexporter/go.sum +++ b/exporter/skywalkingexporter/go.sum @@ -123,46 +123,46 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de 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= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/skywalkingexporter/skywalking.go b/exporter/skywalkingexporter/skywalking.go index 17a3cdafd0ae..a61b761fde2f 100644 --- a/exporter/skywalkingexporter/skywalking.go +++ b/exporter/skywalkingexporter/skywalking.go @@ -50,7 +50,7 @@ func newSwExporter(_ context.Context, cfg *Config, settings component.TelemetryS metadata: metadata.New(nil), settings: settings, } - for k, v := range cfg.GRPCClientSettings.Headers { + for k, v := range cfg.ClientConfig.Headers { oce.metadata.Set(k, string(v)) } return oce @@ -58,7 +58,7 @@ func newSwExporter(_ context.Context, cfg *Config, settings component.TelemetryS // start creates the gRPC client Connection func (oce *swExporter) start(ctx context.Context, host component.Host) error { - clientConn, err := oce.cfg.GRPCClientSettings.ToClientConn(ctx, host, oce.settings) + clientConn, err := oce.cfg.ClientConfig.ToClientConn(ctx, host, oce.settings) if err != nil { return err } diff --git a/exporter/skywalkingexporter/skywalking_benchmark_test.go b/exporter/skywalkingexporter/skywalking_benchmark_test.go index aefcfba68f7f..a62aff28ffbf 100644 --- a/exporter/skywalkingexporter/skywalking_benchmark_test.go +++ b/exporter/skywalkingexporter/skywalking_benchmark_test.go @@ -126,7 +126,7 @@ func doInit(numStream int, t *testing.T) (*swExporter, *grpc.Server, *mockLogHan NumConsumers: 1, QueueSize: 1000, }, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/skywalkingexporter/skywalking_test.go b/exporter/skywalkingexporter/skywalking_test.go index 2f7b38f7aba4..cebb52485bb0 100644 --- a/exporter/skywalkingexporter/skywalking_test.go +++ b/exporter/skywalkingexporter/skywalking_test.go @@ -31,7 +31,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler := initializeGRPCTestServer(t, grpc.MaxConcurrentStreams(10)) tt := &Config{ NumStreams: 10, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -104,7 +104,7 @@ func TestSwExporter(t *testing.T) { server, addr, handler2 := initializeGRPCTestServerMetric(t, grpc.MaxConcurrentStreams(10)) tt = &Config{ NumStreams: 10, - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: addr.String(), TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/exporter/splunkhecexporter/client.go b/exporter/splunkhecexporter/client.go index f5c8884bd885..e8d1748f520c 100644 --- a/exporter/splunkhecexporter/client.go +++ b/exporter/splunkhecexporter/client.go @@ -664,7 +664,7 @@ func checkHecHealth(ctx context.Context, client *http.Client, healthCheckURL *ur func buildHTTPClient(config *Config, host component.Host, telemetrySettings component.TelemetrySettings) (*http.Client, error) { // we handle compression explicitly. - config.HTTPClientConfig.Compression = "" + config.ClientConfig.Compression = "" return config.ToClient(host, telemetrySettings) } diff --git a/exporter/splunkhecexporter/client_test.go b/exporter/splunkhecexporter/client_test.go index 019743d64883..36a8b1a71783 100644 --- a/exporter/splunkhecexporter/client_test.go +++ b/exporter/splunkhecexporter/client_test.go @@ -214,7 +214,7 @@ func runMetricsExport(cfg *Config, metrics pmetric.Metrics, expectedBatchesNum i } factory := NewFactory() - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.Token = "1234-1234" cfg.UseMultiMetricFormat = useMultiMetricsFormat @@ -266,7 +266,7 @@ func runTraceExport(testConfig *Config, traces ptrace.Traces, expectedBatchesNum factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.DisableCompression = testConfig.DisableCompression cfg.MaxContentLengthTraces = testConfig.MaxContentLengthTraces cfg.Token = "1234-1234" @@ -328,7 +328,7 @@ func runLogExport(cfg *Config, ld plog.Logs, expectedBatchesNum int, t *testing. panic(err) } - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" cfg.Token = "1234-1234" rr := make(chan receivedRequest) @@ -1292,7 +1292,7 @@ func TestErrorReceived(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1347,7 +1347,7 @@ func TestInvalidURL(t *testing.T) { cfg.QueueSettings.Enabled = false // Disable retries to not wait too much time for the return error. cfg.BackOffConfig.Enabled = false - cfg.HTTPClientConfig.Endpoint = "ftp://example.com:134" + cfg.ClientConfig.Endpoint = "ftp://example.com:134" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() exporter, err := factory.CreateTracesExporter(context.Background(), params, cfg) @@ -1381,7 +1381,7 @@ func TestHeartbeatStartupFailed(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1419,7 +1419,7 @@ func TestHeartbeatStartupPass_Disabled(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false @@ -1454,7 +1454,7 @@ func TestHeartbeatStartupPass(t *testing.T) { }() factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" + cfg.ClientConfig.Endpoint = "http://" + listener.Addr().String() + "/services/collector" // Disable QueueSettings to ensure that we execute the request when calling ConsumeTraces // otherwise we will not see the error. cfg.QueueSettings.Enabled = false diff --git a/exporter/splunkhecexporter/config.go b/exporter/splunkhecexporter/config.go index f8a0886dd849..8eeaee009cec 100644 --- a/exporter/splunkhecexporter/config.go +++ b/exporter/splunkhecexporter/config.go @@ -64,7 +64,7 @@ type HecTelemetry struct { // Config defines configuration for Splunk exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -137,7 +137,7 @@ type Config struct { func (cfg *Config) getURL() (out *url.URL, err error) { - out, err = url.Parse(cfg.HTTPClientConfig.Endpoint) + out, err = url.Parse(cfg.ClientConfig.Endpoint) if err != nil { return out, err } @@ -153,7 +153,7 @@ func (cfg *Config) Validate() error { if !cfg.LogDataEnabled && !cfg.ProfilingDataEnabled { return errors.New(`either "log_data_enabled" or "profiling_data_enabled" has to be true`) } - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New(`requires a non-empty "endpoint"`) } _, err := cfg.getURL() diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index 56cfbf69e3b2..8f6c7eeb7590 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. defaultCfg := createDefaultConfig().(*Config) defaultCfg.Token = "00000000-0000-0000-0000-0000000000000" - defaultCfg.HTTPClientConfig.Endpoint = "https://splunk:8088/services/collector" + defaultCfg.ClientConfig.Endpoint = "https://splunk:8088/services/collector" hundred := 100 idleConnTimeout := 10 * time.Second @@ -60,7 +60,7 @@ func TestLoadConfig(t *testing.T) { MaxContentLengthLogs: 2 * 1024 * 1024, MaxContentLengthMetrics: 2 * 1024 * 1024, MaxContentLengthTraces: 2 * 1024 * 1024, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10 * time.Second, Endpoint: "https://splunk:8088/services/collector", TLSSetting: configtls.TLSClientSetting{ @@ -149,7 +149,7 @@ func TestConfig_Validate(t *testing.T) { name: "bad url", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "cache_object:foo/bar" + cfg.ClientConfig.Endpoint = "cache_object:foo/bar" cfg.Token = "foo" return cfg }(), @@ -159,7 +159,7 @@ func TestConfig_Validate(t *testing.T) { name: "missing token", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://example.com" + cfg.ClientConfig.Endpoint = "http://example.com" return cfg }(), wantErr: "requires a non-empty \"token\"", @@ -168,7 +168,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for logs", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthLogs = maxContentLengthLogsLimit + 1 cfg.Token = "foo" return cfg @@ -179,7 +179,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for metrics", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthMetrics = maxContentLengthMetricsLimit + 1 cfg.Token = "foo" return cfg @@ -190,7 +190,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default content-length for traces", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxContentLengthTraces = maxContentLengthTracesLimit + 1 cfg.Token = "foo" return cfg @@ -201,7 +201,7 @@ func TestConfig_Validate(t *testing.T) { name: "max default event-size", cfg: func() *Config { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "http://foo_bar.com" + cfg.ClientConfig.Endpoint = "http://foo_bar.com" cfg.MaxEventSize = maxMaxEventSize + 1 cfg.Token = "foo" return cfg diff --git a/exporter/splunkhecexporter/factory.go b/exporter/splunkhecexporter/factory.go index 2fb1070e3c3b..b67baa3d4dce 100644 --- a/exporter/splunkhecexporter/factory.go +++ b/exporter/splunkhecexporter/factory.go @@ -63,7 +63,7 @@ func createDefaultConfig() component.Config { return &Config{ LogDataEnabled: true, ProfilingDataEnabled: true, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, IdleConnTimeout: &defaultIdleConnTimeout, MaxIdleConnsPerHost: &defaultMaxConns, diff --git a/exporter/splunkhecexporter/factory_test.go b/exporter/splunkhecexporter/factory_test.go index 0e7e43ffa6ea..0ae3358958b8 100644 --- a/exporter/splunkhecexporter/factory_test.go +++ b/exporter/splunkhecexporter/factory_test.go @@ -22,7 +22,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateMetricsExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -32,7 +32,7 @@ func TestCreateMetricsExporter(t *testing.T) { func TestCreateTracesExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -42,7 +42,7 @@ func TestCreateTracesExporter(t *testing.T) { func TestCreateLogsExporter(t *testing.T) { cfg := createDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() @@ -54,7 +54,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.Endpoint = "https://example.com:8088/services/collector" + cfg.ClientConfig.Endpoint = "https://example.com:8088/services/collector" cfg.Token = "1234-1234" params := exportertest.NewNopCreateSettings() exp, err := factory.CreateMetricsExporter( @@ -65,7 +65,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { // Set values that don't have a valid default. cfg.Token = "testToken" - cfg.HTTPClientConfig.Endpoint = "https://example.com" + cfg.ClientConfig.Endpoint = "https://example.com" exp, err = factory.CreateMetricsExporter( context.Background(), params, cfg) @@ -78,7 +78,7 @@ func TestCreateInstanceViaFactory(t *testing.T) { func TestFactory_CreateMetricsExporter(t *testing.T) { config := &Config{ Token: "testToken", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://example.com:8000", }, } diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index bfd173c3dc2f..3108feeb8d5e 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -13,16 +13,16 @@ require ( github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -88,15 +88,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index 2ccf53ef9d11..0803132d6443 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -179,44 +179,44 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/splunkhecexporter/integration_test.go b/exporter/splunkhecexporter/integration_test.go index e70e627e14d6..26b108fc899a 100644 --- a/exporter/splunkhecexporter/integration_test.go +++ b/exporter/splunkhecexporter/integration_test.go @@ -232,7 +232,7 @@ func TestSplunkHecExporterEventsToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" @@ -281,7 +281,7 @@ func TestSplunkHecExporterEventsToSplunkNonDefaultIndex(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" @@ -326,7 +326,7 @@ func TestSplunkHecExporterMetricsToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = index @@ -362,7 +362,7 @@ func TestSplunkHecExporterTracesToSplunk(t *testing.T) { // Endpoint and Token do not have a default value so set them directly. config := NewFactory().CreateDefaultConfig().(*Config) config.Token = configopaque.String(integrationtestutils.GetConfigVariable("HEC_TOKEN")) - config.HTTPClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" + config.ClientConfig.Endpoint = "https://" + integrationtestutils.GetConfigVariable("HOST") + ":" + integrationtestutils.GetConfigVariable("HEC_PORT") + "/services/collector" config.Source = "otel" config.SourceType = "st-otel" config.Index = "main" diff --git a/exporter/sumologicexporter/config.go b/exporter/sumologicexporter/config.go index 401e4286600d..568400ef74e7 100644 --- a/exporter/sumologicexporter/config.go +++ b/exporter/sumologicexporter/config.go @@ -15,7 +15,7 @@ import ( // Config defines configuration for Sumo Logic exporter. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` @@ -60,9 +60,9 @@ type Config struct { Client string `mapstructure:"client"` } -// createDefaultHTTPClientConfig returns default http client settings -func createDefaultHTTPClientConfig() confighttp.HTTPClientConfig { - return confighttp.HTTPClientConfig{ +// createDefaultClientConfig returns default http client settings +func createDefaultClientConfig() confighttp.ClientConfig { + return confighttp.ClientConfig{ Timeout: defaultTimeout, } } @@ -148,7 +148,7 @@ func (cfg *Config) Validate() error { return fmt.Errorf("unexpected compression encoding: %s", cfg.CompressEncoding) } - if len(cfg.HTTPClientConfig.Endpoint) == 0 { + if len(cfg.ClientConfig.Endpoint) == 0 { return errors.New("endpoint is not set") } diff --git a/exporter/sumologicexporter/config_test.go b/exporter/sumologicexporter/config_test.go index bd3f2b84cfc6..8eca2feb0951 100644 --- a/exporter/sumologicexporter/config_test.go +++ b/exporter/sumologicexporter/config_test.go @@ -24,7 +24,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "test_format", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -36,7 +36,7 @@ func TestConfigValidation(t *testing.T) { cfg: &Config{ LogFormat: "json", MetricFormat: "test_format", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -50,7 +50,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "test_format", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -63,7 +63,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, }, }, @@ -75,7 +75,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -92,7 +92,7 @@ func TestConfigValidation(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index 36da50f8c2fd..64347cc22313 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -125,7 +125,7 @@ func newMetricsExporter( // start starts the exporter func (se *sumologicexporter) start(_ context.Context, host component.Host) (err error) { - client, err := se.config.HTTPClientConfig.ToClient(host, se.settings) + client, err := se.config.ClientConfig.ToClient(host, se.settings) if err != nil { return fmt.Errorf("failed to create HTTP Client: %w", err) } diff --git a/exporter/sumologicexporter/exporter_test.go b/exporter/sumologicexporter/exporter_test.go index 05b61ce78027..1ce54520b373 100644 --- a/exporter/sumologicexporter/exporter_test.go +++ b/exporter/sumologicexporter/exporter_test.go @@ -35,7 +35,7 @@ func TestInitExporter(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -142,7 +142,7 @@ func TestInvalidSourceFormats(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultTimeout, Endpoint: "test_endpoint", }, @@ -156,7 +156,7 @@ func TestInvalidHTTPCLient(t *testing.T) { LogFormat: "json", MetricFormat: "carbon2", CompressEncoding: "gzip", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "test_endpoint", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return nil, errors.New("roundTripperException") diff --git a/exporter/sumologicexporter/factory.go b/exporter/sumologicexporter/factory.go index 8cbd8718b09a..dadb64969fea 100644 --- a/exporter/sumologicexporter/factory.go +++ b/exporter/sumologicexporter/factory.go @@ -43,9 +43,9 @@ func createDefaultConfig() component.Config { Client: DefaultClient, GraphiteTemplate: DefaultGraphiteTemplate, - HTTPClientConfig: createDefaultHTTPClientConfig(), - BackOffConfig: configretry.NewDefaultBackOffConfig(), - QueueSettings: qs, + ClientConfig: createDefaultClientConfig(), + BackOffConfig: configretry.NewDefaultBackOffConfig(), + QueueSettings: qs, } } diff --git a/exporter/sumologicexporter/factory_test.go b/exporter/sumologicexporter/factory_test.go index 5842d37343a3..ebd1b2106108 100644 --- a/exporter/sumologicexporter/factory_test.go +++ b/exporter/sumologicexporter/factory_test.go @@ -38,7 +38,7 @@ func TestCreateDefaultConfig(t *testing.T) { Client: "otelcol", GraphiteTemplate: "%{_metric_}", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 5 * time.Second, }, BackOffConfig: configretry.NewDefaultBackOffConfig(), diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 96784118ca98..7b0838af7204 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -5,13 +5,13 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -45,17 +45,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 7ddbb171eefc..b21596e1b119 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -72,42 +72,42 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/sumologicexporter/sender.go b/exporter/sumologicexporter/sender.go index b144b1b0c566..0b7f0b516ff9 100644 --- a/exporter/sumologicexporter/sender.go +++ b/exporter/sumologicexporter/sender.go @@ -97,7 +97,7 @@ func (s *sender) send(ctx context.Context, pipeline PipelineType, body io.Reader if err != nil { return err } - req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.config.HTTPClientConfig.Endpoint, data) + req, err := http.NewRequestWithContext(ctx, http.MethodPost, s.config.ClientConfig.Endpoint, data) if err != nil { return err } diff --git a/exporter/sumologicexporter/sender_test.go b/exporter/sumologicexporter/sender_test.go index 23bc7d00b405..8df51f664232 100644 --- a/exporter/sumologicexporter/sender_test.go +++ b/exporter/sumologicexporter/sender_test.go @@ -42,7 +42,7 @@ func prepareSenderTest(t *testing.T, cb []func(w http.ResponseWriter, req *http. })) cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: testServer.URL, Timeout: defaultTimeout, }, @@ -73,7 +73,7 @@ func prepareSenderTest(t *testing.T, cb []func(w http.ResponseWriter, req *http. s: newSender( cfg, &http.Client{ - Timeout: cfg.HTTPClientConfig.Timeout, + Timeout: cfg.ClientConfig.Timeout, }, f, sourceFormats{ @@ -474,7 +474,7 @@ func TestInvalidEndpoint(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" test.s.logBuffer = exampleLog() _, err := test.s.sendLogs(context.Background(), newFields(pcommon.NewMap())) @@ -485,7 +485,7 @@ func TestInvalidPostRequest(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = "" + test.s.config.ClientConfig.Endpoint = "" test.s.logBuffer = exampleLog() _, err := test.s.sendLogs(context.Background(), newFields(pcommon.NewMap())) @@ -496,7 +496,7 @@ func TestLogsBufferOverflow(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" log := exampleLog() flds := newFields(pcommon.NewMap()) @@ -766,7 +766,7 @@ func TestMetricsBufferOverflow(t *testing.T) { test := prepareSenderTest(t, []func(w http.ResponseWriter, req *http.Request){}) defer func() { test.srv.Close() }() - test.s.config.HTTPClientConfig.Endpoint = ":" + test.s.config.ClientConfig.Endpoint = ":" test.s.config.MetricFormat = PrometheusFormat test.s.config.MaxRequestBodySize = 1024 * 1024 * 1024 * 1024 metric := exampleIntMetric() diff --git a/exporter/syslogexporter/go.mod b/exporter/syslogexporter/go.mod index 49abcf24109d..71b8a26644e1 100644 --- a/exporter/syslogexporter/go.mod +++ b/exporter/syslogexporter/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -27,11 +27,11 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect @@ -50,8 +50,8 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 diff --git a/exporter/syslogexporter/go.sum b/exporter/syslogexporter/go.sum index 027feeac8741..2d1202b37b9b 100644 --- a/exporter/syslogexporter/go.sum +++ b/exporter/syslogexporter/go.sum @@ -62,30 +62,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/tencentcloudlogserviceexporter/go.mod b/exporter/tencentcloudlogserviceexporter/go.mod index 9cfdba02ddf5..0441c896c89f 100644 --- a/exporter/tencentcloudlogserviceexporter/go.mod +++ b/exporter/tencentcloudlogserviceexporter/go.mod @@ -7,12 +7,12 @@ require ( github.com/pierrec/lz4 v2.6.1+incompatible github.com/stretchr/testify v1.8.4 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -43,12 +43,12 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/exporter/tencentcloudlogserviceexporter/go.sum b/exporter/tencentcloudlogserviceexporter/go.sum index c410c0f3a27c..f8833ac608bd 100644 --- a/exporter/tencentcloudlogserviceexporter/go.sum +++ b/exporter/tencentcloudlogserviceexporter/go.sum @@ -74,30 +74,30 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854 h1:pP6g github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.854/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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/exporter/zipkinexporter/config.go b/exporter/zipkinexporter/config.go index 0b8a47545959..5f18554fa174 100644 --- a/exporter/zipkinexporter/config.go +++ b/exporter/zipkinexporter/config.go @@ -19,7 +19,7 @@ type Config struct { // Configures the exporter client. // The Endpoint to send the Zipkin trace data to (e.g.: http://some.url:9411/api/v2/spans). - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. Format string `mapstructure:"format"` @@ -30,7 +30,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the exporter configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPClientConfig.Endpoint == "" { + if cfg.ClientConfig.Endpoint == "" { return errors.New("endpoint required") } return nil diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index b9a1fa4b41d3..cd317d160568 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { NumConsumers: 2, QueueSize: 10, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://somedest:1234/api/v2/spans", WriteBufferSize: 524288, Timeout: 5 * time.Second, diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go index 68b2cd3862af..d3d7f423f226 100644 --- a/exporter/zipkinexporter/factory.go +++ b/exporter/zipkinexporter/factory.go @@ -33,13 +33,13 @@ func NewFactory() exporter.Factory { } func createDefaultConfig() component.Config { - defaultClientHTTPSettings := confighttp.NewDefaultHTTPClientConfig() + defaultClientHTTPSettings := confighttp.NewDefaultClientConfig() defaultClientHTTPSettings.Timeout = defaultTimeout defaultClientHTTPSettings.WriteBufferSize = 512 * 1024 return &Config{ BackOffConfig: configretry.NewDefaultBackOffConfig(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), - HTTPClientConfig: defaultClientHTTPSettings, + ClientConfig: defaultClientHTTPSettings, Format: defaultFormat, DefaultServiceName: defaultServiceName, } diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 1b52cc14d11b..06ca7f10318e 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -10,15 +10,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,16 +54,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index 43d076cddc27..384b485e7d36 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -80,44 +80,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index f372f2b25880..78a3b4994e39 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -32,7 +32,7 @@ type zipkinExporter struct { url string client *http.Client serializer zipkinreporter.SpanSerializer - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig settings component.TelemetrySettings } @@ -40,7 +40,7 @@ func createZipkinExporter(cfg *Config, settings component.TelemetrySettings) (*z ze := &zipkinExporter{ defaultServiceName: cfg.DefaultServiceName, url: cfg.Endpoint, - clientSettings: &cfg.HTTPClientConfig, + clientSettings: &cfg.ClientConfig, client: nil, settings: settings, } diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index 156c746bea34..e7dba4a2f768 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -48,7 +48,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { defer cst.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: cst.URL, }, Format: "json", @@ -66,7 +66,7 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } @@ -271,7 +271,7 @@ const zipkinSpansJSONJavaLibrary = ` func TestZipkinExporter_invalidFormat(t *testing.T) { config := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "1.2.3.4", }, Format: "foobar", @@ -295,7 +295,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { defer cst.Close() cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: cst.URL, }, Format: "proto", @@ -314,7 +314,7 @@ func TestZipkinExporter_roundtripProto(t *testing.T) { // Run the Zipkin receiver to "receive spans upload from a client application" addr := testutil.GetAvailableLocalAddress(t) recvCfg := &zipkinreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index d22fbdfdacee..6752010e3ac5 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -6,11 +6,11 @@ require ( bitbucket.org/atlassian/go-asap/v2 v2.7.0 github.com/SermoDigital/jose v0.9.2-0.20180104203859-803625baeddc github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -39,8 +39,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/vincent-petithory/dataurl v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index 7ab6eab40620..22b276e4232d 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -62,20 +62,20 @@ github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8A github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/awsproxy/go.mod b/extension/awsproxy/go.mod index 7b412913b960..e6715673f09d 100644 --- a/extension/awsproxy/go.mod +++ b/extension/awsproxy/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -39,10 +39,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/awsproxy/go.sum b/extension/awsproxy/go.sum index 04160c1bb7ff..5955e7296cd4 100644 --- a/extension/awsproxy/go.sum +++ b/extension/awsproxy/go.sum @@ -59,24 +59,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 239b24808001..7c608ff75db6 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 github.com/tg123/go-htpasswd v1.2.2 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index d3f7084972a9..3a41ec0abce6 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -54,23 +54,23 @@ github.com/tg123/go-htpasswd v1.2.2 h1:tmNccDsQ+wYsoRfiONzIhDm5OkVHQzN3w4FOBAlN6 github.com/tg123/go-htpasswd v1.2.2/go.mod h1:FcIrK0J+6zptgVwK1JDlqyajW/1B4PtuJ/FLWl7nx8A= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 352c0973dd5b..93ba02d9f9cf 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index d5bc18452a26..8c4c75d07bef 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/go.mod b/extension/encoding/go.mod index b9ec9a44074a..461bf8100ed3 100644 --- a/extension/encoding/go.mod +++ b/extension/encoding/go.mod @@ -3,8 +3,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/extension/encod go 1.20 require ( - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -21,9 +21,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/extension/encoding/go.sum b/extension/encoding/go.sum index f861dec139c0..450126230248 100644 --- a/extension/encoding/go.sum +++ b/extension/encoding/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/jaegerencodingextension/go.mod b/extension/encoding/jaegerencodingextension/go.mod index 092975651a1e..6766c32b33c4 100644 --- a/extension/encoding/jaegerencodingextension/go.mod +++ b/extension/encoding/jaegerencodingextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/jaegerencodingextension/go.sum b/extension/encoding/jaegerencodingextension/go.sum index 07574c028055..e09eba851a84 100644 --- a/extension/encoding/jaegerencodingextension/go.sum +++ b/extension/encoding/jaegerencodingextension/go.sum @@ -64,18 +64,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/jsonlogencodingextension/go.mod b/extension/encoding/jsonlogencodingextension/go.mod index ca26d77cea27..3f43d36a77e4 100644 --- a/extension/encoding/jsonlogencodingextension/go.mod +++ b/extension/encoding/jsonlogencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/jsonlogencodingextension/go.sum b/extension/encoding/jsonlogencodingextension/go.sum index 6f1f5f71099c..213366dec28b 100644 --- a/extension/encoding/jsonlogencodingextension/go.sum +++ b/extension/encoding/jsonlogencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/otlpencodingextension/go.mod b/extension/encoding/otlpencodingextension/go.mod index 19d08815345d..e041a1674fae 100644 --- a/extension/encoding/otlpencodingextension/go.mod +++ b/extension/encoding/otlpencodingextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/otlpencodingextension/go.sum b/extension/encoding/otlpencodingextension/go.sum index 6f1f5f71099c..213366dec28b 100644 --- a/extension/encoding/otlpencodingextension/go.sum +++ b/extension/encoding/otlpencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/textencodingextension/go.mod b/extension/encoding/textencodingextension/go.mod index 7b8976bd56e1..af51e025fe55 100644 --- a/extension/encoding/textencodingextension/go.mod +++ b/extension/encoding/textencodingextension/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,7 +37,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/textencodingextension/go.sum b/extension/encoding/textencodingextension/go.sum index 6f1f5f71099c..213366dec28b 100644 --- a/extension/encoding/textencodingextension/go.sum +++ b/extension/encoding/textencodingextension/go.sum @@ -60,16 +60,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/encoding/zipkinencodingextension/go.mod b/extension/encoding/zipkinencodingextension/go.mod index e200291c5a45..68baaebdb249 100644 --- a/extension/encoding/zipkinencodingextension/go.mod +++ b/extension/encoding/zipkinencodingextension/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,9 +40,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/encoding/zipkinencodingextension/go.sum b/extension/encoding/zipkinencodingextension/go.sum index bc9d40982ab7..5375dab7c48d 100644 --- a/extension/encoding/zipkinencodingextension/go.sum +++ b/extension/encoding/zipkinencodingextension/go.sum @@ -66,18 +66,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index c028c1e2be78..a3e895fc5b95 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index e7c613290fbc..9320eb36a85c 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -50,21 +50,21 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/healthcheckextension/README.md b/extension/healthcheckextension/README.md index e4cd0bfc4708..0c31b7afd93d 100644 --- a/extension/healthcheckextension/README.md +++ b/extension/healthcheckextension/README.md @@ -40,7 +40,7 @@ processors in the future. The following settings are required: -- `endpoint` (default = 0.0.0.0:13133): Address to publish the health check status. For full list of `HTTPServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The `component.UseLocalHostAsDefaultHost` feature gate changes this to localhost:13133. This will become the default in a future release. +- `endpoint` (default = 0.0.0.0:13133): Address to publish the health check status. For full list of `ServerConfig` refer [here](https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp). The `component.UseLocalHostAsDefaultHost` feature gate changes this to localhost:13133. This will become the default in a future release. - `path` (default = "/"): Specifies the path to be configured for the health check server. - `response_body` (default = ""): Specifies a static body that overrides the default response returned by the health check service. - `check_collector_pipeline:` (optional): Settings of collector pipeline health check diff --git a/extension/healthcheckextension/config.go b/extension/healthcheckextension/config.go index dce43aa13f5d..cd9526d7f21f 100644 --- a/extension/healthcheckextension/config.go +++ b/extension/healthcheckextension/config.go @@ -25,7 +25,7 @@ type ResponseBodySettings struct { // Config has the configuration for the extension enabling the health check // extension, used to report the health status of the service. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // Path represents the path the health check service will serve. // The default path is "/". diff --git a/extension/healthcheckextension/config_test.go b/extension/healthcheckextension/config_test.go index 5896d5087335..16729c019b64 100644 --- a/extension/healthcheckextension/config_test.go +++ b/extension/healthcheckextension/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:13", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/extension/healthcheckextension/factory.go b/extension/healthcheckextension/factory.go index 85ad8a1204c8..0ebbd1726b78 100644 --- a/extension/healthcheckextension/factory.go +++ b/extension/healthcheckextension/factory.go @@ -28,7 +28,7 @@ func NewFactory() extension.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/healthcheckextension/factory_test.go b/extension/healthcheckextension/factory_test.go index 3b9d92da3c8f..e0c3a83982d1 100644 --- a/extension/healthcheckextension/factory_test.go +++ b/extension/healthcheckextension/factory_test.go @@ -19,7 +19,7 @@ import ( func TestFactory_CreateDefaultConfig(t *testing.T) { cfg := createDefaultConfig() assert.Equal(t, &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:13133", }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index 3951983c5c33..e9ce87f3a054 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,16 +44,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index fc60584845ed..231eb54c7a33 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -105,36 +105,36 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/healthcheckextension/healthcheckextension_test.go b/extension/healthcheckextension/healthcheckextension_test.go index 1e1f4c26a413..eb094ad82a09 100644 --- a/extension/healthcheckextension/healthcheckextension_test.go +++ b/extension/healthcheckextension/healthcheckextension_test.go @@ -47,7 +47,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -74,7 +74,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomizedPathWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -97,7 +97,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithBothCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -124,7 +124,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithHealthyCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -151,7 +151,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithUnhealthyCustomResponseBodyWithoutCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -178,7 +178,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -219,7 +219,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomPathWithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -260,7 +260,7 @@ func TestHealthCheckExtensionUsage(t *testing.T) { { name: "WithCustomStaticResponseBodyWithCheckCollectorPipeline", config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: checkCollectorPipelineSettings{ @@ -353,7 +353,7 @@ func TestHealthCheckExtensionPortAlreadyInUse(t *testing.T) { defer ln.Close() config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: endpoint, }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -366,7 +366,7 @@ func TestHealthCheckExtensionPortAlreadyInUse(t *testing.T) { func TestHealthCheckMultipleStarts(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -384,7 +384,7 @@ func TestHealthCheckMultipleStarts(t *testing.T) { func TestHealthCheckMultipleShutdowns(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), @@ -401,7 +401,7 @@ func TestHealthCheckMultipleShutdowns(t *testing.T) { func TestHealthCheckShutdownWithoutStart(t *testing.T) { config := Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: testutil.GetAvailableLocalAddress(t), }, CheckCollectorPipeline: defaultCheckCollectorPipelineSettings(), diff --git a/extension/httpforwarder/config.go b/extension/httpforwarder/config.go index 13a8a4c83927..d4e3fc80805c 100644 --- a/extension/httpforwarder/config.go +++ b/extension/httpforwarder/config.go @@ -11,8 +11,8 @@ import ( type Config struct { // Ingress holds config settings for HTTP server listening for requests. - Ingress confighttp.HTTPServerConfig `mapstructure:"ingress"` + Ingress confighttp.ServerConfig `mapstructure:"ingress"` // Egress holds config settings to use for forwarded requests. - Egress confighttp.HTTPClientConfig `mapstructure:"egress"` + Egress confighttp.ClientConfig `mapstructure:"egress"` } diff --git a/extension/httpforwarder/config_test.go b/extension/httpforwarder/config_test.go index 8d98026619bd..27fb2c560464 100644 --- a/extension/httpforwarder/config_test.go +++ b/extension/httpforwarder/config_test.go @@ -34,10 +34,10 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: "http://localhost:7070", }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Endpoint: "http://target/", Headers: map[string]configopaque.String{ "otel_http_forwarder": "dev", diff --git a/extension/httpforwarder/extension_test.go b/extension/httpforwarder/extension_test.go index 6cecd86f005d..44854174cc7a 100644 --- a/extension/httpforwarder/extension_test.go +++ b/extension/httpforwarder/extension_test.go @@ -47,7 +47,7 @@ func TestExtension(t *testing.T) { { name: "No additional headers", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, }, @@ -68,10 +68,10 @@ func TestExtension(t *testing.T) { { name: "With additional headers", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -90,10 +90,10 @@ func TestExtension(t *testing.T) { { name: "Error code from backend", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -110,10 +110,10 @@ func TestExtension(t *testing.T) { { name: "Error making request at forwarder", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: listenAt, }, - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Headers: map[string]configopaque.String{ "key": "value", }, @@ -130,7 +130,7 @@ func TestExtension(t *testing.T) { { name: "Invalid config - HTTP Client creation fails", config: &Config{ - Egress: confighttp.HTTPClientConfig{ + Egress: confighttp.ClientConfig{ Endpoint: "localhost:9090", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -145,7 +145,7 @@ func TestExtension(t *testing.T) { { name: "Error on Startup", config: &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: "invalid", // to mock error setting up listener. }, }, diff --git a/extension/httpforwarder/factory.go b/extension/httpforwarder/factory.go index 1f5046f45137..f8f28d79cc88 100644 --- a/extension/httpforwarder/factory.go +++ b/extension/httpforwarder/factory.go @@ -29,10 +29,10 @@ func NewFactory() extension.Factory { } func createDefaultConfig() component.Config { - httpClientSettings := confighttp.NewDefaultHTTPClientConfig() + httpClientSettings := confighttp.NewDefaultClientConfig() httpClientSettings.Timeout = 10 * time.Second return &Config{ - Ingress: confighttp.HTTPServerConfig{ + Ingress: confighttp.ServerConfig{ Endpoint: defaultEndpoint, }, Egress: httpClientSettings, diff --git a/extension/httpforwarder/factory_test.go b/extension/httpforwarder/factory_test.go index d86dd84d6e0f..7207434bac50 100644 --- a/extension/httpforwarder/factory_test.go +++ b/extension/httpforwarder/factory_test.go @@ -39,13 +39,13 @@ func TestFactory(t *testing.T) { }, { name: "Invalid config", - config: &Config{Egress: confighttp.HTTPClientConfig{Endpoint: "123.456.7.89:9090"}}, + config: &Config{Egress: confighttp.ClientConfig{Endpoint: "123.456.7.89:9090"}}, wantErr: true, wantErrMessage: "enter a valid URL for 'egress.endpoint': parse \"123.456.7.89:9090\": first path segment in URL cannot", }, { name: "Valid config", - config: &Config{Egress: confighttp.HTTPClientConfig{Endpoint: "localhost:9090"}}, + config: &Config{Egress: confighttp.ClientConfig{Endpoint: "localhost:9090"}}, }, } for _, test := range tests { diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 798adae13708..4bdfc2096305 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,14 +42,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 70898f07438e..1d8fd64ea97b 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/jaegerremotesampling/config.go b/extension/jaegerremotesampling/config.go index 3d244429f4b7..ae7520aaca15 100644 --- a/extension/jaegerremotesampling/config.go +++ b/extension/jaegerremotesampling/config.go @@ -21,8 +21,8 @@ var ( // Config has the configuration for the extension enabling the health check // extension, used to report the health status of the service. type Config struct { - *confighttp.HTTPServerConfig `mapstructure:"http"` - *configgrpc.GRPCServerSettings `mapstructure:"grpc"` + HTTPServerConfig *confighttp.ServerConfig `mapstructure:"http"` + GRPCServerConfig *configgrpc.ServerConfig `mapstructure:"grpc"` // Source configures the source for the strategies file. One of `remote` or `file` has to be specified. Source Source `mapstructure:"source"` @@ -30,7 +30,7 @@ type Config struct { type Source struct { // Remote defines the remote location for the file - Remote *configgrpc.GRPCClientSettings `mapstructure:"remote"` + Remote *configgrpc.ClientConfig `mapstructure:"remote"` // File specifies a local file as the strategies source File string `mapstructure:"file"` @@ -43,7 +43,7 @@ var _ component.Config = (*Config)(nil) // Validate checks if the extension configuration is valid func (cfg *Config) Validate() error { - if cfg.HTTPServerConfig == nil && cfg.GRPCServerSettings == nil { + if cfg.HTTPServerConfig == nil && cfg.GRPCServerConfig == nil { return errAtLeastOneProtocol } diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 43174721268e..ca175bc836ab 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -29,13 +29,13 @@ func TestLoadConfig(t *testing.T) { { id: component.NewID(metadata.Type), expected: &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, Source: Source{ - Remote: &configgrpc.GRPCClientSettings{ + Remote: &configgrpc.ClientConfig{ Endpoint: "jaeger-collector:14250", }, }, @@ -44,8 +44,8 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "1"), expected: &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, @@ -86,16 +86,16 @@ func TestValidate(t *testing.T) { { desc: "no sources", cfg: Config{ - GRPCServerSettings: &configgrpc.GRPCServerSettings{}, + GRPCServerConfig: &configgrpc.ServerConfig{}, }, expected: errNoSources, }, { desc: "too many sources", cfg: Config{ - GRPCServerSettings: &configgrpc.GRPCServerSettings{}, + GRPCServerConfig: &configgrpc.ServerConfig{}, Source: Source{ - Remote: &configgrpc.GRPCClientSettings{}, + Remote: &configgrpc.ClientConfig{}, File: "/tmp/some-file", }, }, diff --git a/extension/jaegerremotesampling/extension.go b/extension/jaegerremotesampling/extension.go index 663a6a14d927..0b3577a7d270 100644 --- a/extension/jaegerremotesampling/extension.go +++ b/extension/jaegerremotesampling/extension.go @@ -85,8 +85,8 @@ func (jrse *jrsExtension) Start(ctx context.Context, host component.Host) error } } - if jrse.cfg.GRPCServerSettings != nil { - grpcServer, err := internal.NewGRPC(jrse.telemetry, *jrse.cfg.GRPCServerSettings, jrse.samplingStore) + if jrse.cfg.GRPCServerConfig != nil { + grpcServer, err := internal.NewGRPC(jrse.telemetry, *jrse.cfg.GRPCServerConfig, jrse.samplingStore) if err != nil { return fmt.Errorf("error while creating the gRPC server: %w", err) } diff --git a/extension/jaegerremotesampling/extension_test.go b/extension/jaegerremotesampling/extension_test.go index 6e7acf235d17..abb8b243b252 100644 --- a/extension/jaegerremotesampling/extension_test.go +++ b/extension/jaegerremotesampling/extension_test.go @@ -97,9 +97,9 @@ func TestRemote(t *testing.T) { // create the config, pointing to the mock server cfg := testConfig() - cfg.GRPCServerSettings.NetAddr.Endpoint = "127.0.0.1:0" + cfg.GRPCServerConfig.NetAddr.Endpoint = "127.0.0.1:0" cfg.Source.ReloadInterval = tc.reloadInterval - cfg.Source.Remote = &configgrpc.GRPCClientSettings{ + cfg.Source.Remote = &configgrpc.ClientConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", lis.Addr().(*net.TCPAddr).Port), TLSSetting: configtls.TLSClientSetting{ Insecure: true, // test only @@ -164,6 +164,6 @@ func (s *samplingServer) GetSamplingStrategy(ctx context.Context, params *api_v2 func testConfig() *Config { cfg := createDefaultConfig().(*Config) cfg.HTTPServerConfig.Endpoint = "127.0.0.1:5778" - cfg.GRPCServerSettings.NetAddr.Endpoint = "127.0.0.1:14250" + cfg.GRPCServerConfig.NetAddr.Endpoint = "127.0.0.1:14250" return cfg } diff --git a/extension/jaegerremotesampling/factory.go b/extension/jaegerremotesampling/factory.go index 9123dee0e1de..78d1b30ba614 100644 --- a/extension/jaegerremotesampling/factory.go +++ b/extension/jaegerremotesampling/factory.go @@ -31,10 +31,10 @@ func NewFactory() extension.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{ + HTTPServerConfig: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(5778), }, - GRPCServerSettings: &configgrpc.GRPCServerSettings{ + GRPCServerConfig: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(14250), Transport: "tcp", diff --git a/extension/jaegerremotesampling/factory_test.go b/extension/jaegerremotesampling/factory_test.go index e8fb9c0484d6..4c0dfd0ad70f 100644 --- a/extension/jaegerremotesampling/factory_test.go +++ b/extension/jaegerremotesampling/factory_test.go @@ -18,8 +18,8 @@ import ( func TestCreateDefaultConfig(t *testing.T) { // prepare and test expected := &Config{ - HTTPServerConfig: &confighttp.HTTPServerConfig{Endpoint: "0.0.0.0:5778"}, - GRPCServerSettings: &configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + HTTPServerConfig: &confighttp.ServerConfig{Endpoint: "0.0.0.0:5778"}, + GRPCServerConfig: &configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }}, diff --git a/extension/jaegerremotesampling/go.mod b/extension/jaegerremotesampling/go.mod index aec7ffa5532c..f7bf201433e6 100644 --- a/extension/jaegerremotesampling/go.mod +++ b/extension/jaegerremotesampling/go.mod @@ -8,15 +8,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -62,13 +62,13 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.18.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/extension/jaegerremotesampling/go.sum b/extension/jaegerremotesampling/go.sum index 656023e7c340..d1a8561c0050 100644 --- a/extension/jaegerremotesampling/go.sum +++ b/extension/jaegerremotesampling/go.sum @@ -113,39 +113,39 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/extension/jaegerremotesampling/internal/grpc.go b/extension/jaegerremotesampling/internal/grpc.go index 97f44efb74d5..9d672e56e572 100644 --- a/extension/jaegerremotesampling/internal/grpc.go +++ b/extension/jaegerremotesampling/internal/grpc.go @@ -33,7 +33,7 @@ type grpcServer interface { // NewGRPC returns a new sampling gRPC Server. func NewGRPC( telemetry component.TelemetrySettings, - settings configgrpc.GRPCServerSettings, + settings configgrpc.ServerConfig, strategyStore strategystore.StrategyStore, ) (*SamplingGRPCServer, error) { if strategyStore == nil { @@ -50,7 +50,7 @@ func NewGRPC( // SamplingGRPCServer implements component.Component to make the life cycle easy to manage. type SamplingGRPCServer struct { telemetry component.TelemetrySettings - settings configgrpc.GRPCServerSettings + settings configgrpc.ServerConfig strategyStore strategystore.StrategyStore grpcServer grpcServer diff --git a/extension/jaegerremotesampling/internal/grpc_test.go b/extension/jaegerremotesampling/internal/grpc_test.go index 9d93aff32fd8..6c95df005e14 100644 --- a/extension/jaegerremotesampling/internal/grpc_test.go +++ b/extension/jaegerremotesampling/internal/grpc_test.go @@ -17,14 +17,14 @@ import ( ) func TestMissingClientConfigManagerGRPC(t *testing.T) { - s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), configgrpc.GRPCServerSettings{}, nil) + s, err := NewGRPC(componenttest.NewNopTelemetrySettings(), configgrpc.ServerConfig{}, nil) assert.Equal(t, errMissingStrategyStore, err) assert.Nil(t, s) } func TestStartAndStopGRPC(t *testing.T) { // prepare - srvSettings := configgrpc.GRPCServerSettings{ + srvSettings := configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "127.0.0.1:0", Transport: "tcp", diff --git a/extension/jaegerremotesampling/internal/http.go b/extension/jaegerremotesampling/internal/http.go index 05487f67a948..b376723c3fe0 100644 --- a/extension/jaegerremotesampling/internal/http.go +++ b/extension/jaegerremotesampling/internal/http.go @@ -25,7 +25,7 @@ var _ component.Component = (*SamplingHTTPServer)(nil) type SamplingHTTPServer struct { telemetry component.TelemetrySettings - settings confighttp.HTTPServerConfig + settings confighttp.ServerConfig strategyStore strategystore.StrategyStore mux *http.ServeMux @@ -33,7 +33,7 @@ type SamplingHTTPServer struct { shutdownWG *sync.WaitGroup } -func NewHTTP(telemetry component.TelemetrySettings, settings confighttp.HTTPServerConfig, strategyStore strategystore.StrategyStore) (*SamplingHTTPServer, error) { +func NewHTTP(telemetry component.TelemetrySettings, settings confighttp.ServerConfig, strategyStore strategystore.StrategyStore) (*SamplingHTTPServer, error) { if strategyStore == nil { return nil, errMissingStrategyStore } diff --git a/extension/jaegerremotesampling/internal/http_test.go b/extension/jaegerremotesampling/internal/http_test.go index 11c38e935809..18bdb4736463 100644 --- a/extension/jaegerremotesampling/internal/http_test.go +++ b/extension/jaegerremotesampling/internal/http_test.go @@ -21,14 +21,14 @@ import ( ) func TestMissingClientConfigManagerHTTP(t *testing.T) { - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, nil) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, nil) assert.Equal(t, errMissingStrategyStore, err) assert.Nil(t, s) } func TestStartAndStopHTTP(t *testing.T) { // prepare - srvSettings := confighttp.HTTPServerConfig{ + srvSettings := confighttp.ServerConfig{ Endpoint: "127.0.0.1:0", } s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), srvSettings, &mockCfgMgr{}) @@ -53,7 +53,7 @@ func TestEndpointsAreWired(t *testing.T) { for _, tC := range testCases { t.Run(tC.desc, func(t *testing.T) { // prepare - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{ + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{ getSamplingStrategyFunc: func(ctx context.Context, serviceName string) (*api_v2.SamplingStrategyResponse, error) { return &api_v2.SamplingStrategyResponse{ ProbabilisticSampling: &api_v2.ProbabilisticSamplingStrategy{ @@ -87,7 +87,7 @@ func TestEndpointsAreWired(t *testing.T) { func TestServiceNameIsRequired(t *testing.T) { // prepare - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{}) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{}) require.NoError(t, err) require.NotNil(t, s) @@ -105,7 +105,7 @@ func TestServiceNameIsRequired(t *testing.T) { } func TestErrorFromClientConfigManager(t *testing.T) { - s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.HTTPServerConfig{}, &mockCfgMgr{}) + s, err := NewHTTP(componenttest.NewNopTelemetrySettings(), confighttp.ServerConfig{}, &mockCfgMgr{}) require.NoError(t, err) require.NotNil(t, s) diff --git a/extension/jaegerremotesampling/internal/remote_strategy_store.go b/extension/jaegerremotesampling/internal/remote_strategy_store.go index 1c0a052f33bd..2f452ec364c3 100644 --- a/extension/jaegerremotesampling/internal/remote_strategy_store.go +++ b/extension/jaegerremotesampling/internal/remote_strategy_store.go @@ -30,7 +30,7 @@ type grpcRemoteStrategyStore struct { // for service-specific outbound GetSamplingStrategy calls. func NewRemoteStrategyStore( conn *grpc.ClientConn, - grpcClientSettings *configgrpc.GRPCClientSettings, + grpcClientSettings *configgrpc.ClientConfig, reloadInterval time.Duration, ) (strategystore.StrategyStore, io.Closer) { cache := newNoopStrategyCache() diff --git a/extension/oauth2clientauthextension/extension_test.go b/extension/oauth2clientauthextension/extension_test.go index 3a8ed4892b79..2e68687aeafd 100644 --- a/extension/oauth2clientauthextension/extension_test.go +++ b/extension/oauth2clientauthextension/extension_test.go @@ -316,7 +316,7 @@ func TestFailContactingOAuth(t *testing.T) { assert.Contains(t, err.Error(), serverURL.String()) // Test for HTTP connections - setting := confighttp.HTTPClientConfig{ + setting := confighttp.ClientConfig{ Endpoint: "http://example.com/", CustomRoundTripper: func(next http.RoundTripper) (http.RoundTripper, error) { return oauth2Authenticator.roundTripper(next) diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index afbf041c179b..ab6978ca2c7a 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -47,13 +47,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 2b8734fc5a31..04d3e94c9195 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -68,35 +68,35 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index 9471bc73bb28..1b27f6827f8d 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -10,9 +10,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -68,8 +68,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index f62d7259ebef..1781e074c159 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -130,16 +130,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 2dff94f308fd..dae0580d5da6 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/hashicorp/golang-lru v1.0.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index fa6d329560f3..a191944c997a 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -57,16 +57,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/ecstaskobserver/config.go b/extension/observer/ecstaskobserver/config.go index 9fd9c23ef209..7d3a0a218d84 100644 --- a/extension/observer/ecstaskobserver/config.go +++ b/extension/observer/ecstaskobserver/config.go @@ -17,7 +17,7 @@ const ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // RefreshInterval determines the frequency at which the observer // needs to poll for collecting new information about task containers. diff --git a/extension/observer/ecstaskobserver/config_test.go b/extension/observer/ecstaskobserver/config_test.go index f80d20f7d3bf..4a9da20bf93b 100644 --- a/extension/observer/ecstaskobserver/config_test.go +++ b/extension/observer/ecstaskobserver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "with-endpoint"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://a.valid.url:1234/path", }, PortLabels: []string{"ECS_TASK_OBSERVER_PORT"}, diff --git a/extension/observer/ecstaskobserver/factory.go b/extension/observer/ecstaskobserver/factory.go index 271cf82bc024..366b8635d38b 100644 --- a/extension/observer/ecstaskobserver/factory.go +++ b/extension/observer/ecstaskobserver/factory.go @@ -74,7 +74,7 @@ func metadataProviderFromEndpoint(config *Config, settings component.TelemetrySe return nil, fmt.Errorf("failed to parse task metadata endpoint: %w", err) } - restClient, err := ecsutil.NewRestClient(*parsed, config.HTTPClientConfig, settings) + restClient, err := ecsutil.NewRestClient(*parsed, config.ClientConfig, settings) if err != nil { return nil, fmt.Errorf("failed to create ECS Task Observer rest client: %w", err) } diff --git a/extension/observer/ecstaskobserver/go.mod b/extension/observer/ecstaskobserver/go.mod index 88e1378d08f1..d01ce3f400dc 100644 --- a/extension/observer/ecstaskobserver/go.mod +++ b/extension/observer/ecstaskobserver/go.mod @@ -7,10 +7,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,16 +42,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/observer/ecstaskobserver/go.sum b/extension/observer/ecstaskobserver/go.sum index b487d65b9d69..5bd9a8faa3fb 100644 --- a/extension/observer/ecstaskobserver/go.sum +++ b/extension/observer/ecstaskobserver/go.sum @@ -63,35 +63,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index fb6a2db9df22..72d1ac6de850 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 4700e85aac6f..c2abc7b1a1c3 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -75,16 +75,16 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 87619950f2ec..5814265241ae 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,9 +6,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -54,8 +54,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 14297bfe469f..ab52b9089c87 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -256,16 +256,16 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index f2f0d17e6c75..9b93421775cd 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -35,8 +35,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index f2995f758d04..bb0a3c326a13 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -59,21 +59,21 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/opampextension/go.mod b/extension/opampextension/go.mod index a54441d869c9..6135680860d6 100644 --- a/extension/opampextension/go.mod +++ b/extension/opampextension/go.mod @@ -7,13 +7,13 @@ require ( github.com/oklog/ulid/v2 v2.1.0 github.com/open-telemetry/opamp-go v0.12.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/opampextension/go.sum b/extension/opampextension/go.sum index 5fd4a03ee66f..e78f77732b63 100644 --- a/extension/opampextension/go.sum +++ b/extension/opampextension/go.sum @@ -61,22 +61,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 178608719af3..8056ab5c3e64 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -35,9 +35,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 839eb5c2ad96..f7d3e344e86a 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/remotetapextension/config.go b/extension/remotetapextension/config.go index ba46f12660f1..a9942dc4977f 100644 --- a/extension/remotetapextension/config.go +++ b/extension/remotetapextension/config.go @@ -9,12 +9,12 @@ import ( ) type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct } func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "127.0.0.1:11000", }, } diff --git a/extension/remotetapextension/extension.go b/extension/remotetapextension/extension.go index ce394243ac00..b1722b7f249a 100644 --- a/extension/remotetapextension/extension.go +++ b/extension/remotetapextension/extension.go @@ -31,7 +31,7 @@ func (s *remoteObserverExtension) Start(_ context.Context, host component.Host) } mux := http.NewServeMux() mux.Handle("/", http.FileServer(http.FS(htmlContent))) - s.server, err = s.config.HTTPServerConfig.ToServer(host, s.settings.TelemetrySettings, mux) + s.server, err = s.config.ServerConfig.ToServer(host, s.settings.TelemetrySettings, mux) if err != nil { return err } diff --git a/extension/remotetapextension/go.mod b/extension/remotetapextension/go.mod index 41ba6a523654..df48ac1f1f91 100644 --- a/extension/remotetapextension/go.mod +++ b/extension/remotetapextension/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,16 +38,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/remotetapextension/go.sum b/extension/remotetapextension/go.sum index 70898f07438e..1d8fd64ea97b 100644 --- a/extension/remotetapextension/go.sum +++ b/extension/remotetapextension/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index 141617615fc4..c46200fa36ac 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -8,10 +8,10 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.16.16 github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -46,8 +46,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 9bd301c3898b..e8ed9d830486 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -73,18 +73,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/solarwindsapmsettingsextension/go.mod b/extension/solarwindsapmsettingsextension/go.mod index e9a934a83658..933482c485f3 100644 --- a/extension/solarwindsapmsettingsextension/go.mod +++ b/extension/solarwindsapmsettingsextension/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -30,9 +30,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/solarwindsapmsettingsextension/go.sum b/extension/solarwindsapmsettingsextension/go.sum index ddbc850405d6..49c96f14855c 100644 --- a/extension/solarwindsapmsettingsextension/go.sum +++ b/extension/solarwindsapmsettingsextension/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index a7390f8605f8..7ebb612df80f 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -7,10 +7,10 @@ require ( github.com/mattn/go-sqlite3 v1.14.20 github.com/stretchr/testify v1.8.4 go.etcd.io/bbolt v1.3.8 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,8 +45,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index fe3e9c84daa9..a2483970724a 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -160,18 +160,18 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index 21a1347005b3..1b4c7fbefea8 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -39,16 +39,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index 222b61e753e1..8ebc923e687e 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -64,35 +64,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/go.mod b/go.mod index 929b936553cf..486242f6b0cb 100644 --- a/go.mod +++ b/go.mod @@ -169,22 +169,22 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.93.0 - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d ) require ( @@ -623,25 +623,25 @@ require ( go.mongodb.org/atlas v0.36.0 // indirect go.mongodb.org/mongo-driver v1.13.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/go.sum b/go.sum index 01143ee20c66..ce56c096247a 100644 --- a/go.sum +++ b/go.sum @@ -1574,76 +1574,76 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f h1:rp9Cmq8D/8PU4gSyvs8Qu8O/4zPI0IvEuy3gRHwaH8Q= -go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f h1:wQcpS+Mm42oaYDZ2YqqNc/bmxzeHUD2KzL7Vgx7pDj0= -go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d h1:J2RWigq8AmA1aVjaYXq8EnbAm3xJQymiTiqprciE3vs= +go.opentelemetry.io/collector/connector/forwardconnector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:g/60r64E+uGzIZQmF/ZOfe5j0iSX5cHBzZ8O+3W3l7o= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d h1:eONwZYONNf2uu7zSbv8PurEP+f+Cf/fWPx3gEw5zOVM= +go.opentelemetry.io/collector/exporter/loggingexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:VPv8rSsFBrd5ZZD1BS8A8eTsDYC3uvmDwBTc7EKpk/0= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/internal/aws/containerinsight/go.mod b/internal/aws/containerinsight/go.mod index 0c6aeac17d0f..11f90edfd515 100644 --- a/internal/aws/containerinsight/go.mod +++ b/internal/aws/containerinsight/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) diff --git a/internal/aws/containerinsight/go.sum b/internal/aws/containerinsight/go.sum index 50168a1c9bf0..0a4054f18d72 100644 --- a/internal/aws/containerinsight/go.sum +++ b/internal/aws/containerinsight/go.sum @@ -29,8 +29,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/internal/aws/cwlogs/go.mod b/internal/aws/cwlogs/go.mod index ce014f8e62df..91bb551d0ed9 100644 --- a/internal/aws/cwlogs/go.mod +++ b/internal/aws/cwlogs/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/aws/aws-sdk-go v1.50.7 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -23,9 +23,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/aws/cwlogs/go.sum b/internal/aws/cwlogs/go.sum index b11ed5e048ab..b5ec87fd89f7 100644 --- a/internal/aws/cwlogs/go.sum +++ b/internal/aws/cwlogs/go.sum @@ -45,14 +45,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/aws/ecsutil/client.go b/internal/aws/ecsutil/client.go index 38dabda7bf10..116d2b0c70f9 100644 --- a/internal/aws/ecsutil/client.go +++ b/internal/aws/ecsutil/client.go @@ -22,7 +22,7 @@ type Client interface { } // NewClientProvider creates the default rest client provider -func NewClientProvider(baseURL url.URL, clientSettings confighttp.HTTPClientConfig, host component.Host, settings component.TelemetrySettings) ClientProvider { +func NewClientProvider(baseURL url.URL, clientSettings confighttp.ClientConfig, host component.Host, settings component.TelemetrySettings) ClientProvider { return &defaultClientProvider{ baseURL: baseURL, clientSettings: clientSettings, @@ -38,7 +38,7 @@ type ClientProvider interface { type defaultClientProvider struct { baseURL url.URL - clientSettings confighttp.HTTPClientConfig + clientSettings confighttp.ClientConfig host component.Host settings component.TelemetrySettings } @@ -54,7 +54,7 @@ func (dcp *defaultClientProvider) BuildClient() (Client, error) { func defaultClient( baseURL url.URL, - clientSettings confighttp.HTTPClientConfig, + clientSettings confighttp.ClientConfig, host component.Host, settings component.TelemetrySettings, ) (*clientImpl, error) { diff --git a/internal/aws/ecsutil/client_test.go b/internal/aws/ecsutil/client_test.go index 8a0a3c2d62f6..e478386ced39 100644 --- a/internal/aws/ecsutil/client_test.go +++ b/internal/aws/ecsutil/client_test.go @@ -36,7 +36,7 @@ func TestClient(t *testing.T) { func TestNewClientProvider(t *testing.T) { baseURL, _ := url.Parse("http://localhost:8080") - provider := NewClientProvider(*baseURL, confighttp.HTTPClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) + provider := NewClientProvider(*baseURL, confighttp.ClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) require.NotNil(t, provider) _, ok := provider.(*defaultClientProvider) require.True(t, ok) @@ -48,7 +48,7 @@ func TestNewClientProvider(t *testing.T) { func TestDefaultClient(t *testing.T) { endpoint, _ := url.Parse("http://localhost:8080") - client, err := defaultClient(*endpoint, confighttp.HTTPClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) + client, err := defaultClient(*endpoint, confighttp.ClientConfig{}, componenttest.NewNopHost(), componenttest.NewNopTelemetrySettings()) require.NoError(t, err) require.NotNil(t, client.httpClient.Transport) require.Equal(t, "http://localhost:8080", client.baseURL.String()) diff --git a/internal/aws/ecsutil/go.mod b/internal/aws/ecsutil/go.mod index ef8abed84167..755491253f97 100644 --- a/internal/aws/ecsutil/go.mod +++ b/internal/aws/ecsutil/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -36,18 +36,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/internal/aws/ecsutil/go.sum b/internal/aws/ecsutil/go.sum index 70898f07438e..1d8fd64ea97b 100644 --- a/internal/aws/ecsutil/go.sum +++ b/internal/aws/ecsutil/go.sum @@ -62,35 +62,35 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= go.opentelemetry.io/collector/consumer v0.93.0 h1:tt9T8knyamBr/85VqIbESsIHVkFXCkwOD+noFqK3+Vg= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/internal/aws/ecsutil/metadata_provider.go b/internal/aws/ecsutil/metadata_provider.go index 701355b6815c..34b814aba246 100644 --- a/internal/aws/ecsutil/metadata_provider.go +++ b/internal/aws/ecsutil/metadata_provider.go @@ -42,7 +42,7 @@ func NewDetectedTaskMetadataProvider(set component.TelemetrySettings) (MetadataP return nil, fmt.Errorf("unable to detect task metadata endpoint") } - clientSettings := confighttp.HTTPClientConfig{} + clientSettings := confighttp.ClientConfig{} client, err := NewRestClient(*endpoint, clientSettings, set) if err != nil { return nil, err diff --git a/internal/aws/ecsutil/rest_client.go b/internal/aws/ecsutil/rest_client.go index ed5266f0765f..8ec8162b96e9 100644 --- a/internal/aws/ecsutil/rest_client.go +++ b/internal/aws/ecsutil/rest_client.go @@ -10,7 +10,7 @@ import ( "go.opentelemetry.io/collector/config/confighttp" ) -func NewRestClient(baseEndpoint url.URL, clientSettings confighttp.HTTPClientConfig, settings component.TelemetrySettings) (RestClient, error) { +func NewRestClient(baseEndpoint url.URL, clientSettings confighttp.ClientConfig, settings component.TelemetrySettings) (RestClient, error) { clientProvider := NewClientProvider(baseEndpoint, clientSettings, &nopHost{}, settings) client, err := clientProvider.BuildClient() diff --git a/internal/aws/ecsutil/rest_client_test.go b/internal/aws/ecsutil/rest_client_test.go index 6ba4a8c6df85..d971fa439e30 100644 --- a/internal/aws/ecsutil/rest_client_test.go +++ b/internal/aws/ecsutil/rest_client_test.go @@ -23,7 +23,7 @@ func (f *fakeClient) Get(path string) ([]byte, error) { func TestRestClient(t *testing.T) { u, _ := url.Parse("http://www.test.com") - rest, err := NewRestClient(*u, confighttp.HTTPClientConfig{}, componenttest.NewNopTelemetrySettings()) + rest, err := NewRestClient(*u, confighttp.ClientConfig{}, componenttest.NewNopTelemetrySettings()) require.NoError(t, err) require.NotNil(t, rest) } diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index d83691f74d8d..d3ea9cdbf44b 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,8 +6,8 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/zap v1.26.0 ) @@ -17,8 +17,8 @@ require ( github.com/hashicorp/go-version v1.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.14.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index 53c6f964886b..c696d9b97ef8 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -11,22 +11,29 @@ 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/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= 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/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/internal/aws/xray/go.mod b/internal/aws/xray/go.mod index b297bafac48b..43b3edc1f16d 100644 --- a/internal/aws/xray/go.mod +++ b/internal/aws/xray/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -24,9 +24,9 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/aws/xray/go.sum b/internal/aws/xray/go.sum index ffbc9ad8754c..d564068a9000 100644 --- a/internal/aws/xray/go.sum +++ b/internal/aws/xray/go.sum @@ -45,14 +45,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/common/go.mod b/internal/common/go.mod index 43a50085b401..707848602aee 100644 --- a/internal/common/go.mod +++ b/internal/common/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) diff --git a/internal/common/go.sum b/internal/common/go.sum index 54897502b80e..7cf5cd9e55df 100644 --- a/internal/common/go.sum +++ b/internal/common/go.sum @@ -9,8 +9,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= 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= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 35573ace0175..f96ee80b4a1c 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -78,8 +78,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index d25ea4e1d91d..fee9dc6b0c6f 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -138,24 +138,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/datadog/go.mod b/internal/datadog/go.mod index 3c0f0e04c2df..d7a994f50d3a 100644 --- a/internal/datadog/go.mod +++ b/internal/datadog/go.mod @@ -7,8 +7,8 @@ require ( github.com/DataDog/datadog-agent/pkg/trace v0.50.2 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics v0.13.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -64,10 +64,10 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/datadog/go.sum b/internal/datadog/go.sum index 3e39335fdf86..1648e1d55fb8 100644 --- a/internal/datadog/go.sum +++ b/internal/datadog/go.sum @@ -165,18 +165,18 @@ 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/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/filter/go.mod b/internal/filter/go.mod index 5628124d4168..db1280031e65 100644 --- a/internal/filter/go.mod +++ b/internal/filter/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 ) @@ -45,7 +45,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/filter/go.sum b/internal/filter/go.sum index f14af2d76e41..9a070aeb2e90 100644 --- a/internal/filter/go.sum +++ b/internal/filter/go.sum @@ -75,18 +75,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/kafka/go.mod b/internal/kafka/go.mod index ea419d0779b4..842178344bbd 100644 --- a/internal/kafka/go.mod +++ b/internal/kafka/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go v1.50.7 github.com/stretchr/testify v1.8.4 github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -34,7 +34,8 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect golang.org/x/crypto v0.17.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/sys v0.15.0 // indirect diff --git a/internal/kafka/go.sum b/internal/kafka/go.sum index d93c09f9cb9f..3a343a165d0a 100644 --- a/internal/kafka/go.sum +++ b/internal/kafka/go.sum @@ -27,6 +27,7 @@ github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9 github.com/hashicorp/go-uuid v1.0.2/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.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= @@ -45,8 +46,14 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= +github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374mizHuIWj+OSJCajGr/phAmuMug9qIX3l9CflE= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -71,10 +78,13 @@ github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3k github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= 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= diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 7d44531d3af7..8ec544794233 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 k8s.io/client-go v0.28.4 @@ -37,7 +37,7 @@ require ( github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.18.0 // indirect golang.org/x/oauth2 v0.14.0 // indirect diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index e502172bb2d9..479534a6d450 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -140,6 +140,7 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -157,6 +158,9 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= 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/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= +github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -171,7 +175,10 @@ 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/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= 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/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= 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= @@ -228,10 +235,12 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.0 h1:uYiak0iPuSW4BQIEuN+yihQqvWRwURhoW/qoVs4vLFA= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= 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= diff --git a/internal/metadataproviders/go.mod b/internal/metadataproviders/go.mod index f5b2dc6d6c0e..ca488b4e2738 100644 --- a/internal/metadataproviders/go.mod +++ b/internal/metadataproviders/go.mod @@ -9,7 +9,7 @@ require ( github.com/hashicorp/consul/api v1.27.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 go.uber.org/goleak v1.3.0 diff --git a/internal/metadataproviders/go.sum b/internal/metadataproviders/go.sum index af345a00fe1e..1a37d01ac6ad 100644 --- a/internal/metadataproviders/go.sum +++ b/internal/metadataproviders/go.sum @@ -392,8 +392,8 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/internal/sharedcomponent/go.mod b/internal/sharedcomponent/go.mod index 599c1b37559f..2eb29f1afa55 100644 --- a/internal/sharedcomponent/go.mod +++ b/internal/sharedcomponent/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) @@ -27,9 +27,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/sharedcomponent/go.sum b/internal/sharedcomponent/go.sum index af10395414ee..b982ccdab978 100644 --- a/internal/sharedcomponent/go.sum +++ b/internal/sharedcomponent/go.sum @@ -47,14 +47,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 3978899db3b9..5a223ac3181d 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -27,12 +27,12 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 7df2ff341c2f..607e286faf1c 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -51,27 +51,27 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/sqlquery/go.mod b/internal/sqlquery/go.mod index 6f6f9b313482..52cf4728164c 100644 --- a/internal/sqlquery/go.mod +++ b/internal/sqlquery/go.mod @@ -10,9 +10,9 @@ require ( github.com/sijms/go-ora/v2 v2.8.6 github.com/snowflakedb/gosnowflake v1.7.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 ) @@ -84,10 +84,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/internal/sqlquery/go.sum b/internal/sqlquery/go.sum index 554cdd09e397..361083e9881a 100644 --- a/internal/sqlquery/go.sum +++ b/internal/sqlquery/go.sum @@ -202,20 +202,20 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index b269d93b77c9..d209a52f07fd 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/build-tools/crosslink v0.12.0 go.opentelemetry.io/build-tools/issuegenerator v0.12.0 go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63 - go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 golang.org/x/tools v0.17.0 golang.org/x/vuln v1.0.3 diff --git a/internal/tools/go.sum b/internal/tools/go.sum index a6e7853d64df..12996b504731 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -655,8 +655,8 @@ go.opentelemetry.io/build-tools/issuegenerator v0.12.0 h1:KRP7aSUR9JoqNwv+Pp595v go.opentelemetry.io/build-tools/issuegenerator v0.12.0/go.mod h1:G71Og7dZJoIC+MjuY1InQ/oeAOkM1S5Nv6CCnlOdqns= go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63 h1:/k1/akmYXP+ZRoHoNCbmLpluR7l1+Y+9mBL0kuIwjks= go.opentelemetry.io/build-tools/multimod v0.12.1-0.20240108171606-a2b17e6d6e63/go.mod h1:EGWcKkk7JQzxREP7M23rWiRK+RZioVOFRdM1KW6pnJc= -go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f h1:vkmaJMsUknvG9/P8Ez6H+mHh1h7PjqeiLJgyh5chPrg= -go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PZfoFOWMKq9tFC6YQfiU5vG/Q4prdm05zwatfyQyY+Q= +go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d h1:LcVcdpUQMnGAmi+PysjDtJHQun+XuwXhUy51nf8SETk= +go.opentelemetry.io/collector/cmd/builder v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PZfoFOWMKq9tFC6YQfiU5vG/Q4prdm05zwatfyQyY+Q= go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 10931e6021db..007b1202672a 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index 0d1592126d38..18314fbb808f 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -30,10 +30,10 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 8009f4127232..9fe430309e93 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index 2a9dca69a2b5..daaeb807784b 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/experimentalmetricmetadata/go.mod b/pkg/experimentalmetricmetadata/go.mod index b429e5c1eeef..f684728ead9d 100644 --- a/pkg/experimentalmetricmetadata/go.mod +++ b/pkg/experimentalmetricmetadata/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/experimentalmetricmetadata/go.sum b/pkg/experimentalmetricmetadata/go.sum index 2a9dca69a2b5..daaeb807784b 100644 --- a/pkg/experimentalmetricmetadata/go.sum +++ b/pkg/experimentalmetricmetadata/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/golden/go.mod b/pkg/golden/go.mod index 85bd300700fb..d06c529c3774 100644 --- a/pkg/golden/go.mod +++ b/pkg/golden/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/pkg/golden/go.sum b/pkg/golden/go.sum index ba49c7b478d4..1b33123f3631 100644 --- a/pkg/golden/go.sum +++ b/pkg/golden/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/ottl/go.mod b/pkg/ottl/go.mod index 4fc2166d7674..f0194b9a7d87 100644 --- a/pkg/ottl/go.mod +++ b/pkg/ottl/go.mod @@ -11,8 +11,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/pkg/ottl/go.sum b/pkg/ottl/go.sum index 27f65c7a3c79..67c8129b8e8a 100644 --- a/pkg/ottl/go.sum +++ b/pkg/ottl/go.sum @@ -69,14 +69,14 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/pdatatest/go.mod b/pkg/pdatatest/go.mod index 15770311231a..a9d3dddd860b 100644 --- a/pkg/pdatatest/go.mod +++ b/pkg/pdatatest/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/pdatatest/go.sum b/pkg/pdatatest/go.sum index ba49c7b478d4..1b33123f3631 100644 --- a/pkg/pdatatest/go.sum +++ b/pkg/pdatatest/go.sum @@ -31,8 +31,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/pdatautil/go.mod b/pkg/pdatautil/go.mod index d6978b1f36b7..8c92f4c487d2 100644 --- a/pkg/pdatautil/go.mod +++ b/pkg/pdatautil/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/cespare/xxhash/v2 v2.2.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/pdatautil/go.sum b/pkg/pdatautil/go.sum index f4ecbf2e9778..16d418090a33 100644 --- a/pkg/pdatautil/go.sum +++ b/pkg/pdatautil/go.sum @@ -22,8 +22,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index 2df0687ee4e2..bbf429c49daa 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,9 +5,9 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) @@ -25,9 +25,9 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index ab107b140868..ca11e178e5aa 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -49,18 +49,18 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/sampling/go.mod b/pkg/sampling/go.mod index 34a2fc3d5df1..1d1c08b8b67b 100644 --- a/pkg/sampling/go.mod +++ b/pkg/sampling/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/multierr v1.11.0 ) diff --git a/pkg/sampling/go.sum b/pkg/sampling/go.sum index 422eac3118e9..b94cc94be195 100644 --- a/pkg/sampling/go.sum +++ b/pkg/sampling/go.sum @@ -20,8 +20,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= diff --git a/pkg/stanza/go.mod b/pkg/stanza/go.mod index aebb8823cec7..b69f46739b8f 100644 --- a/pkg/stanza/go.mod +++ b/pkg/stanza/go.mod @@ -15,14 +15,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 github.com/valyala/fastjson v1.6.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 @@ -57,9 +57,9 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect diff --git a/pkg/stanza/go.sum b/pkg/stanza/go.sum index 00dcdca4ab24..58b8b4cf9355 100644 --- a/pkg/stanza/go.sum +++ b/pkg/stanza/go.sum @@ -87,28 +87,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/pkg/translator/azure/go.mod b/pkg/translator/azure/go.mod index 621da29dc79b..233912242b28 100644 --- a/pkg/translator/azure/go.mod +++ b/pkg/translator/azure/go.mod @@ -7,9 +7,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/relvacode/iso8601 v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/zap v1.26.0 golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc @@ -30,8 +30,8 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/metric v1.22.0 // indirect go.opentelemetry.io/otel/trace v1.22.0 // indirect diff --git a/pkg/translator/azure/go.sum b/pkg/translator/azure/go.sum index 7d96f0b6cbc6..2f453c073ce2 100644 --- a/pkg/translator/azure/go.sum +++ b/pkg/translator/azure/go.sum @@ -47,16 +47,16 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index df06183ca2b1..8c70e56f9a26 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,8 +6,8 @@ require ( github.com/jaegertracing/jaeger v1.53.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 7689ae871462..02b5362d11e6 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -35,10 +35,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= diff --git a/pkg/translator/loki/go.mod b/pkg/translator/loki/go.mod index b2203b8b3231..0d0f97c21b2b 100644 --- a/pkg/translator/loki/go.mod +++ b/pkg/translator/loki/go.mod @@ -11,8 +11,8 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) @@ -35,7 +35,7 @@ require ( github.com/prometheus/client_golang v1.18.0 // indirect github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect diff --git a/pkg/translator/loki/go.sum b/pkg/translator/loki/go.sum index fce174bab0b4..b93daae4d073 100644 --- a/pkg/translator/loki/go.sum +++ b/pkg/translator/loki/go.sum @@ -76,12 +76,12 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index e90ab7ae7942..f0d447f608f7 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 google.golang.org/protobuf v1.32.0 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 98fbb64f73a5..1546a981f8b7 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -74,10 +74,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= 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= diff --git a/pkg/translator/prometheus/go.mod b/pkg/translator/prometheus/go.mod index 0374933c29e3..a6f2cafd4ebe 100644 --- a/pkg/translator/prometheus/go.mod +++ b/pkg/translator/prometheus/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/prometheus/go.sum b/pkg/translator/prometheus/go.sum index aedeb0c09f02..d9a41e28a5b1 100644 --- a/pkg/translator/prometheus/go.sum +++ b/pkg/translator/prometheus/go.sum @@ -33,10 +33,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/translator/prometheusremotewrite/go.mod b/pkg/translator/prometheusremotewrite/go.mod index 20551b307701..7d25de68681a 100644 --- a/pkg/translator/prometheusremotewrite/go.mod +++ b/pkg/translator/prometheusremotewrite/go.mod @@ -8,8 +8,8 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) @@ -23,7 +23,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/pkg/translator/prometheusremotewrite/go.sum b/pkg/translator/prometheusremotewrite/go.sum index c095d7c9d35b..eff531db0207 100644 --- a/pkg/translator/prometheusremotewrite/go.sum +++ b/pkg/translator/prometheusremotewrite/go.sum @@ -37,12 +37,12 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= 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= diff --git a/pkg/translator/signalfx/go.mod b/pkg/translator/signalfx/go.mod index c86ef869c5b7..d092ace85c00 100644 --- a/pkg/translator/signalfx/go.mod +++ b/pkg/translator/signalfx/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 ) diff --git a/pkg/translator/signalfx/go.sum b/pkg/translator/signalfx/go.sum index 1e32003eb659..69e9b1842137 100644 --- a/pkg/translator/signalfx/go.sum +++ b/pkg/translator/signalfx/go.sum @@ -43,8 +43,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= 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= diff --git a/pkg/translator/skywalking/go.mod b/pkg/translator/skywalking/go.mod index af96873efb33..90ada580b2f0 100644 --- a/pkg/translator/skywalking/go.mod +++ b/pkg/translator/skywalking/go.mod @@ -5,8 +5,8 @@ go 1.20 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 skywalking.apache.org/repo/goapi v0.0.0-20240104145220-ba7202308dd4 ) diff --git a/pkg/translator/skywalking/go.sum b/pkg/translator/skywalking/go.sum index 279f0e5f15fa..fd91f446c684 100644 --- a/pkg/translator/skywalking/go.sum +++ b/pkg/translator/skywalking/go.sum @@ -80,10 +80,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de 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= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 38a51dfa2d5b..36d94eac3e00 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index 0b74117b674c..262ac44c4d3c 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -37,10 +37,10 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 3bbf69d91d84..a4fd17b1a8f7 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,9 +50,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 40a3aaadc359..db099f263801 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -75,24 +75,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 169d643c67b8..af3498a5cab8 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index a0dae8378430..a27d3c79b4fd 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -60,20 +60,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/datadogprocessor/go.mod b/processor/datadogprocessor/go.mod index 474a4623c889..3ab49870b8cd 100644 --- a/processor/datadogprocessor/go.mod +++ b/processor/datadogprocessor/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -83,10 +83,10 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/datadogprocessor/go.sum b/processor/datadogprocessor/go.sum index 0530027d5b2a..47fcaae9f80f 100644 --- a/processor/datadogprocessor/go.sum +++ b/processor/datadogprocessor/go.sum @@ -171,28 +171,28 @@ 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/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/deltatocumulativeprocessor/go.mod b/processor/deltatocumulativeprocessor/go.mod index 3b44f2649323..5d7f8a408d26 100644 --- a/processor/deltatocumulativeprocessor/go.mod +++ b/processor/deltatocumulativeprocessor/go.mod @@ -3,10 +3,10 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/delta go 1.20 require ( - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -24,8 +24,8 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.20.0 // indirect diff --git a/processor/deltatocumulativeprocessor/go.sum b/processor/deltatocumulativeprocessor/go.sum index 7c676716db8c..7946bcdb68a5 100644 --- a/processor/deltatocumulativeprocessor/go.sum +++ b/processor/deltatocumulativeprocessor/go.sum @@ -45,18 +45,18 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= 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/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 0cb23037013e..b56ca36d013b 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index fab34e91971a..5a07d3ff842b 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index a5e5b4232c86..0dd8824d8612 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 @@ -51,10 +51,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 40a3aaadc359..db099f263801 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -75,24 +75,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 21f8137ea1a8..d7b3c7e12b46 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk/metric v1.22.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index fab34e91971a..5a07d3ff842b 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 26d3fbda167b..c76e89ea7fea 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 9837e4bd6add..9a3558688ca5 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -95,20 +95,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/intervalprocessor/go.mod b/processor/intervalprocessor/go.mod index 4b38ecd4fe43..ffe966cc408d 100644 --- a/processor/intervalprocessor/go.mod +++ b/processor/intervalprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/intervalprocessor/go.sum b/processor/intervalprocessor/go.sum index ec6bc93391ae..da30ceafb62e 100644 --- a/processor/intervalprocessor/go.sum +++ b/processor/intervalprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 7bc4727c2149..0936c30a11e5 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -10,16 +10,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8stest v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -83,17 +83,17 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 2614566a47ab..c398c5b193d9 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -1223,48 +1223,48 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/logstransformprocessor/go.mod b/processor/logstransformprocessor/go.mod index bb79664f45a4..796f5ad0fbc8 100644 --- a/processor/logstransformprocessor/go.mod +++ b/processor/logstransformprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,10 +48,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/logstransformprocessor/go.sum b/processor/logstransformprocessor/go.sum index b5bfedbdb6a6..6a0dbe6396e2 100644 --- a/processor/logstransformprocessor/go.sum +++ b/processor/logstransformprocessor/go.sum @@ -74,26 +74,26 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index a1c8e38ba109..378479cb7675 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index fab34e91971a..5a07d3ff842b 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index b89a701e5326..0a41acfb8b87 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index fab34e91971a..5a07d3ff842b 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 67917a57cd14..82cbc411ca29 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -6,14 +6,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,13 +58,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index a1e85b554af6..0f0c75eae489 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -133,39 +133,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/processor/redactionprocessor/go.mod b/processor/redactionprocessor/go.mod index b35a100fec11..2215544faf32 100644 --- a/processor/redactionprocessor/go.mod +++ b/processor/redactionprocessor/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/redactionprocessor/go.sum b/processor/redactionprocessor/go.sum index fab34e91971a..5a07d3ff842b 100644 --- a/processor/redactionprocessor/go.sum +++ b/processor/redactionprocessor/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/remotetapprocessor/config.go b/processor/remotetapprocessor/config.go index df52f2bd1b70..2591b882582a 100644 --- a/processor/remotetapprocessor/config.go +++ b/processor/remotetapprocessor/config.go @@ -14,7 +14,7 @@ import ( const defaultPort = 12001 type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // Limit is a float that indicates the maximum number of messages repeated // through the websocket by this processor in messages per second. Defaults to 1. @@ -23,7 +23,7 @@ type Config struct { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, Limit: 1, diff --git a/processor/remotetapprocessor/go.mod b/processor/remotetapprocessor/go.mod index cdccb0f189be..daa6ef0ad72e 100644 --- a/processor/remotetapprocessor/go.mod +++ b/processor/remotetapprocessor/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/remotetapprocessor/go.sum b/processor/remotetapprocessor/go.sum index 886d275deec9..944cea987808 100644 --- a/processor/remotetapprocessor/go.sum +++ b/processor/remotetapprocessor/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/remotetapprocessor/processor.go b/processor/remotetapprocessor/processor.go index e730ac8b735a..30b186a6c3e3 100644 --- a/processor/remotetapprocessor/processor.go +++ b/processor/remotetapprocessor/processor.go @@ -44,11 +44,11 @@ func newProcessor(settings processor.CreateSettings, config *Config) *wsprocesso func (w *wsprocessor) Start(_ context.Context, host component.Host) error { var err error var ln net.Listener - ln, err = w.config.HTTPServerConfig.ToListener() + ln, err = w.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", w.config.Endpoint, err) } - w.server, err = w.config.HTTPServerConfig.ToServer(host, w.telemetrySettings, websocket.Handler(w.handleConn)) + w.server, err = w.config.ServerConfig.ToServer(host, w.telemetrySettings, websocket.Handler(w.handleConn)) if err != nil { return err } diff --git a/processor/remotetapprocessor/server_test.go b/processor/remotetapprocessor/server_test.go index 61fde8d78035..66e7e1f75672 100644 --- a/processor/remotetapprocessor/server_test.go +++ b/processor/remotetapprocessor/server_test.go @@ -22,7 +22,7 @@ import ( func TestSocketConnectionLogs(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12001", }, } @@ -59,7 +59,7 @@ func TestSocketConnectionLogs(t *testing.T) { func TestSocketConnectionMetrics(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12002", }, } @@ -94,7 +94,7 @@ func TestSocketConnectionMetrics(t *testing.T) { func TestSocketConnectionTraces(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12003", }, } diff --git a/processor/resourcedetectionprocessor/config.go b/processor/resourcedetectionprocessor/config.go index 78ed1a6c9f9d..8dd1c1f10c8b 100644 --- a/processor/resourcedetectionprocessor/config.go +++ b/processor/resourcedetectionprocessor/config.go @@ -36,7 +36,7 @@ type Config struct { DetectorConfig DetectorConfig `mapstructure:",squash"` // HTTP client settings for the detector // Timeout default is 5s - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Attributes is an allowlist of attributes to add. // If a supplied attribute is not a valid attribute of a supplied detector it will be ignored. // Deprecated: Please use detector's resource_attributes config instead diff --git a/processor/resourcedetectionprocessor/config_test.go b/processor/resourcedetectionprocessor/config_test.go index 16d51b0ae7d2..829e3f6accf9 100644 --- a/processor/resourcedetectionprocessor/config_test.go +++ b/processor/resourcedetectionprocessor/config_test.go @@ -27,7 +27,7 @@ import ( func TestLoadConfig(t *testing.T) { t.Parallel() - cfg := confighttp.NewDefaultHTTPClientConfig() + cfg := confighttp.NewDefaultClientConfig() cfg.Timeout = 2 * time.Second openshiftConfig := detectorCreateDefaultConfig() openshiftConfig.OpenShiftConfig = openshift.Config{ @@ -69,65 +69,65 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "openshift"), expected: &Config{ - Detectors: []string{"openshift"}, - DetectorConfig: openshiftConfig, - HTTPClientConfig: cfg, - Override: false, + Detectors: []string{"openshift"}, + DetectorConfig: openshiftConfig, + ClientConfig: cfg, + Override: false, }, }, { id: component.NewIDWithName(metadata.Type, "gcp"), expected: &Config{ - Detectors: []string{"env", "gcp"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "gcp"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "ec2"), expected: &Config{ - Detectors: []string{"env", "ec2"}, - DetectorConfig: ec2Config, - HTTPClientConfig: cfg, - Override: false, + Detectors: []string{"env", "ec2"}, + DetectorConfig: ec2Config, + ClientConfig: cfg, + Override: false, }, }, { id: component.NewIDWithName(metadata.Type, "system"), expected: &Config{ - Detectors: []string{"env", "system"}, - DetectorConfig: systemConfig, - HTTPClientConfig: cfg, - Override: false, - Attributes: []string{"a", "b"}, + Detectors: []string{"env", "system"}, + DetectorConfig: systemConfig, + ClientConfig: cfg, + Override: false, + Attributes: []string{"a", "b"}, }, }, { id: component.NewIDWithName(metadata.Type, "heroku"), expected: &Config{ - Detectors: []string{"env", "heroku"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "heroku"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "lambda"), expected: &Config{ - Detectors: []string{"env", "lambda"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{"env", "lambda"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: detectorCreateDefaultConfig(), }, }, { id: component.NewIDWithName(metadata.Type, "resourceattributes"), expected: &Config{ - Detectors: []string{"system", "ec2"}, - HTTPClientConfig: cfg, - Override: false, - DetectorConfig: resourceAttributesConfig, + Detectors: []string{"system", "ec2"}, + ClientConfig: cfg, + Override: false, + DetectorConfig: resourceAttributesConfig, }, }, { diff --git a/processor/resourcedetectionprocessor/factory.go b/processor/resourcedetectionprocessor/factory.go index b3c291abf522..ae6ba8aec4cd 100644 --- a/processor/resourcedetectionprocessor/factory.go +++ b/processor/resourcedetectionprocessor/factory.go @@ -85,18 +85,18 @@ func (*factory) Type() component.Type { func createDefaultConfig() component.Config { return &Config{ - Detectors: []string{env.TypeStr}, - HTTPClientConfig: defaultHTTPClientConfig(), - Override: true, - Attributes: nil, - DetectorConfig: detectorCreateDefaultConfig(), + Detectors: []string{env.TypeStr}, + ClientConfig: defaultClientConfig(), + Override: true, + Attributes: nil, + DetectorConfig: detectorCreateDefaultConfig(), // TODO: Once issue(https://github.com/open-telemetry/opentelemetry-collector/issues/4001) gets resolved, // Set the default value of 'hostname_source' here instead of 'system' detector } } -func defaultHTTPClientConfig() confighttp.HTTPClientConfig { - httpClientSettings := confighttp.NewDefaultHTTPClientConfig() +func defaultClientConfig() confighttp.ClientConfig { + httpClientSettings := confighttp.NewDefaultClientConfig() httpClientSettings.Timeout = 5 * time.Second return httpClientSettings } @@ -172,7 +172,7 @@ func (f *factory) getResourceDetectionProcessor( if oCfg.Attributes != nil { params.Logger.Warn("You are using deprecated `attributes` option that will be removed soon; use `resource_attributes` instead, details on configuration: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourcedetectionprocessor#migration-from-attributes-to-resource_attributes") } - provider, err := f.getResourceProvider(params, oCfg.HTTPClientConfig.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) + provider, err := f.getResourceProvider(params, oCfg.ClientConfig.Timeout, oCfg.Detectors, oCfg.DetectorConfig, oCfg.Attributes) if err != nil { return nil, err } @@ -180,7 +180,7 @@ func (f *factory) getResourceDetectionProcessor( return &resourceDetectionProcessor{ provider: provider, override: oCfg.Override, - httpClientSettings: oCfg.HTTPClientConfig, + httpClientSettings: oCfg.ClientConfig, telemetrySettings: params.TelemetrySettings, }, nil } diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 45b994fc1d60..7990a7a773e9 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -15,16 +15,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -108,13 +108,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index e6aa249dd57e..8d63f4e971f5 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -445,40 +445,40 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go index 22fa2f943f4c..34ae8022b4fb 100644 --- a/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go +++ b/processor/resourcedetectionprocessor/internal/aws/ec2/ec2.go @@ -85,7 +85,7 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem res := d.rb.Emit() if len(d.tagKeyRegexes) != 0 { - client := getHTTPClientConfig(ctx, d.logger) + client := getClientConfig(ctx, d.logger) tags, err := connectAndFetchEc2Tags(meta.Region, meta.InstanceID, d.tagKeyRegexes, client) if err != nil { return res, "", fmt.Errorf("failed fetching ec2 instance tags: %w", err) @@ -98,7 +98,7 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem return res, conventions.SchemaURL, nil } -func getHTTPClientConfig(ctx context.Context, logger *zap.Logger) *http.Client { +func getClientConfig(ctx context.Context, logger *zap.Logger) *http.Client { client, err := internal.ClientFromContext(ctx) if err != nil { client = http.DefaultClient diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor.go b/processor/resourcedetectionprocessor/resourcedetection_processor.go index 81b12bad8ee8..a3b07c6636ac 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor.go @@ -21,7 +21,7 @@ type resourceDetectionProcessor struct { resource pcommon.Resource schemaURL string override bool - httpClientSettings confighttp.HTTPClientConfig + httpClientSettings confighttp.ClientConfig telemetrySettings component.TelemetrySettings } diff --git a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go index 533e587fe833..41201ca15527 100644 --- a/processor/resourcedetectionprocessor/resourcedetection_processor_test.go +++ b/processor/resourcedetectionprocessor/resourcedetection_processor_test.go @@ -162,9 +162,9 @@ func TestResourceProcessor(t *testing.T) { } cfg := &Config{ - Override: tt.override, - Detectors: tt.detectorKeys, - HTTPClientConfig: confighttp.HTTPClientConfig{Timeout: time.Second}, + Override: tt.override, + Detectors: tt.detectorKeys, + ClientConfig: confighttp.ClientConfig{Timeout: time.Second}, } // Test trace consumer diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index 47643866f5c6..44c41b3b1002 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 2ec16b5022c1..775e99fd272e 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -60,22 +60,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/routingprocessor/factory_test.go b/processor/routingprocessor/factory_test.go index 91a4720e9966..f78e98f30bce 100644 --- a/processor/routingprocessor/factory_test.go +++ b/processor/routingprocessor/factory_test.go @@ -139,7 +139,7 @@ func TestShouldNotFailWhenNextIsProcessor(t *testing.T) { func TestProcessorDoesNotFailToBuildExportersWithMultiplePipelines(t *testing.T) { otlpExporterFactory := otlpexporter.NewFactory() otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index cb7470679735..192a104c491e 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -6,15 +6,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -56,18 +56,18 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 9d58c1ce4cc1..50b043baddef 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -86,48 +86,48 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/routingprocessor/traces_test.go b/processor/routingprocessor/traces_test.go index 12a981499974..e6a235e9458b 100644 --- a/processor/routingprocessor/traces_test.go +++ b/processor/routingprocessor/traces_test.go @@ -36,7 +36,7 @@ func TestTraces_RegisterExportersForValidRoute(t *testing.T) { otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/schemaprocessor/config.go b/processor/schemaprocessor/config.go index c6f1dec5fc90..a9cd2108db8c 100644 --- a/processor/schemaprocessor/config.go +++ b/processor/schemaprocessor/config.go @@ -19,7 +19,7 @@ var ( // Config defines the user provided values for the Schema Processor type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // PreCache is a list of schema URLs that are downloaded // and cached at the start of the collector runtime diff --git a/processor/schemaprocessor/config_test.go b/processor/schemaprocessor/config_test.go index 3b03beed97d3..5afbafbae253 100644 --- a/processor/schemaprocessor/config_test.go +++ b/processor/schemaprocessor/config_test.go @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, component.UnmarshalConfig(sub, cfg)) assert.Equal(t, &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), Prefetch: []string{ "https://opentelemetry.io/schemas/1.9.0", }, diff --git a/processor/schemaprocessor/factory.go b/processor/schemaprocessor/factory.go index 77f4089b59d8..a12ad5af94ee 100644 --- a/processor/schemaprocessor/factory.go +++ b/processor/schemaprocessor/factory.go @@ -26,7 +26,7 @@ type factory struct{} // with the default values being used throughout it func newDefaultConfiguration() component.Config { return &Config{ - HTTPClientConfig: confighttp.NewDefaultHTTPClientConfig(), + ClientConfig: confighttp.NewDefaultClientConfig(), } } diff --git a/processor/schemaprocessor/go.mod b/processor/schemaprocessor/go.mod index 9e93f04b769d..c9958e92f07a 100644 --- a/processor/schemaprocessor/go.mod +++ b/processor/schemaprocessor/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/schema v0.0.7 go.opentelemetry.io/otel/trace v1.22.0 @@ -47,16 +47,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/schemaprocessor/go.sum b/processor/schemaprocessor/go.sum index 389203cfe792..0d317049a631 100644 --- a/processor/schemaprocessor/go.sum +++ b/processor/schemaprocessor/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 9414072be608..1b8943eb7e02 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -54,18 +54,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index d40dc1ce5e3e..3e5345bd4f5b 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -84,50 +84,50 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 1955dd41ce43..ced0fae28eda 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -723,7 +723,7 @@ func newOTLPExporters(t *testing.T) (component.ID, exporter.Metrics, exporter.Tr otlpExpFactory := otlpexporter.NewFactory() otlpID := component.NewID("otlp") otlpConfig := &otlpexporter.Config{ - GRPCClientSettings: configgrpc.GRPCClientSettings{ + ClientConfig: configgrpc.ClientConfig{ Endpoint: "example.com:1234", }, } diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 1e4de2c7a32b..c7fcccaeb7f4 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,9 +48,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 55e59222ee98..72504cfcc761 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -73,24 +73,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/sumologicprocessor/go.mod b/processor/sumologicprocessor/go.mod index ae9857782f69..5bf0f621fb81 100644 --- a/processor/sumologicprocessor/go.mod +++ b/processor/sumologicprocessor/go.mod @@ -5,13 +5,13 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -57,14 +57,14 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/processor/sumologicprocessor/go.sum b/processor/sumologicprocessor/go.sum index 3a150c6f53b1..58ad3b5d438e 100644 --- a/processor/sumologicprocessor/go.sum +++ b/processor/sumologicprocessor/go.sum @@ -135,39 +135,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index c06a44201a15..0798c7d7a8ed 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 06d77e2a70be..aa83dd665232 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -109,20 +109,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/processor/transformprocessor/go.mod b/processor/transformprocessor/go.mod index 6f933a877d75..58be9ed7ee7e 100644 --- a/processor/transformprocessor/go.mod +++ b/processor/transformprocessor/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -49,8 +49,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/processor/transformprocessor/go.sum b/processor/transformprocessor/go.sum index 8a87e179dad7..8633ce2d4f53 100644 --- a/processor/transformprocessor/go.sum +++ b/processor/transformprocessor/go.sum @@ -71,22 +71,22 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/activedirectorydsreceiver/go.mod b/receiver/activedirectorydsreceiver/go.mod index f7e3559bc20b..949f02b95f33 100644 --- a/receiver/activedirectorydsreceiver/go.mod +++ b/receiver/activedirectorydsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/activedirectorydsreceiver/go.sum b/receiver/activedirectorydsreceiver/go.sum index 34a9a518f50c..cfc42422d1fd 100644 --- a/receiver/activedirectorydsreceiver/go.sum +++ b/receiver/activedirectorydsreceiver/go.sum @@ -59,20 +59,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/aerospikereceiver/go.mod b/receiver/aerospikereceiver/go.mod index 94bb0e1a5fb6..0225bdf78d5a 100644 --- a/receiver/aerospikereceiver/go.mod +++ b/receiver/aerospikereceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,8 +82,8 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/aerospikereceiver/go.sum b/receiver/aerospikereceiver/go.sum index 5947820f9879..8f4b3aa2e372 100644 --- a/receiver/aerospikereceiver/go.sum +++ b/receiver/aerospikereceiver/go.sum @@ -147,24 +147,24 @@ github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 h1:5mLPGnFdSsevFRF github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/apachereceiver/config.go b/receiver/apachereceiver/config.go index 7df3578bbce7..b78ca79afdce 100644 --- a/receiver/apachereceiver/config.go +++ b/receiver/apachereceiver/config.go @@ -15,7 +15,7 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/apachereceiver/factory.go b/receiver/apachereceiver/factory.go index 397cf79c24dc..f11e1dde6719 100644 --- a/receiver/apachereceiver/factory.go +++ b/receiver/apachereceiver/factory.go @@ -36,7 +36,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/apachereceiver/go.mod b/receiver/apachereceiver/go.mod index 81d2b190ad78..d8368cab9d14 100644 --- a/receiver/apachereceiver/go.mod +++ b/receiver/apachereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,15 +82,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/apachereceiver/go.sum b/receiver/apachereceiver/go.sum index 41de5a28ca60..ae93146cc736 100644 --- a/receiver/apachereceiver/go.sum +++ b/receiver/apachereceiver/go.sum @@ -146,38 +146,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/apachereceiver/scraper_test.go b/receiver/apachereceiver/scraper_test.go index 3e4d55fd2e0a..ab17716b64f5 100644 --- a/receiver/apachereceiver/scraper_test.go +++ b/receiver/apachereceiver/scraper_test.go @@ -56,7 +56,7 @@ func TestScraper(t *testing.T) { func TestScraperFailedStart(t *testing.T) { sc := newApacheScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/apachesparkreceiver/client_test.go b/receiver/apachesparkreceiver/client_test.go index 1796fab7e534..655c17ecd3b5 100644 --- a/receiver/apachesparkreceiver/client_test.go +++ b/receiver/apachesparkreceiver/client_test.go @@ -37,7 +37,7 @@ func TestNewApacheSparkClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/apachesparkreceiver/config.go b/receiver/apachesparkreceiver/config.go index 02d485e1d441..d9a44689237c 100644 --- a/receiver/apachesparkreceiver/config.go +++ b/receiver/apachesparkreceiver/config.go @@ -27,7 +27,7 @@ var ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` ApplicationNames []string `mapstructure:"application_names"` } diff --git a/receiver/apachesparkreceiver/config_test.go b/receiver/apachesparkreceiver/config_test.go index 1130e4319a50..2e43e5a5c551 100644 --- a/receiver/apachesparkreceiver/config_test.go +++ b/receiver/apachesparkreceiver/config_test.go @@ -29,7 +29,7 @@ func TestValidate(t *testing.T) { { desc: "invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/apachesparkreceiver/factory.go b/receiver/apachesparkreceiver/factory.go index ac46b082b8b0..b2ec51d11045 100644 --- a/receiver/apachesparkreceiver/factory.go +++ b/receiver/apachesparkreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/apachesparkreceiver/factory_test.go b/receiver/apachesparkreceiver/factory_test.go index 4d2219e7d378..82e89ec4b639 100644 --- a/receiver/apachesparkreceiver/factory_test.go +++ b/receiver/apachesparkreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: defaultCollectionInterval, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/apachesparkreceiver/go.mod b/receiver/apachesparkreceiver/go.mod index ccba6bec3394..8401db38660c 100644 --- a/receiver/apachesparkreceiver/go.mod +++ b/receiver/apachesparkreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,16 +82,16 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/apachesparkreceiver/go.sum b/receiver/apachesparkreceiver/go.sum index 1a1990444a36..8c328ca9b5bb 100644 --- a/receiver/apachesparkreceiver/go.sum +++ b/receiver/apachesparkreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/apachesparkreceiver/scraper_test.go b/receiver/apachesparkreceiver/scraper_test.go index 7ec0f72f61dc..4a93d110d945 100644 --- a/receiver/apachesparkreceiver/scraper_test.go +++ b/receiver/apachesparkreceiver/scraper_test.go @@ -69,7 +69,7 @@ func TestScraper(t *testing.T) { CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"local-123", "local-987"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), @@ -216,7 +216,7 @@ func TestScraper(t *testing.T) { CollectionInterval: defaultCollectionInterval, }, ApplicationNames: []string{"streaming-example"}, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/awscloudwatchmetricsreceiver/go.mod b/receiver/awscloudwatchmetricsreceiver/go.mod index ffdd10659916..96514a55a234 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.mod +++ b/receiver/awscloudwatchmetricsreceiver/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awscloudwatchmetricsreceiver/go.sum b/receiver/awscloudwatchmetricsreceiver/go.sum index e6ec1e61c9b6..14d49b044ff0 100644 --- a/receiver/awscloudwatchmetricsreceiver/go.sum +++ b/receiver/awscloudwatchmetricsreceiver/go.sum @@ -59,18 +59,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/awscloudwatchreceiver/go.mod b/receiver/awscloudwatchreceiver/go.mod index 6cc5e5988263..aa2f4bfe0283 100644 --- a/receiver/awscloudwatchreceiver/go.mod +++ b/receiver/awscloudwatchreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awscloudwatchreceiver/go.sum b/receiver/awscloudwatchreceiver/go.sum index c98dfe847846..e0fc3cc920e3 100644 --- a/receiver/awscloudwatchreceiver/go.sum +++ b/receiver/awscloudwatchreceiver/go.sum @@ -70,18 +70,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 554372365ea2..a2197ae81603 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,12 +13,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.93.0 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -115,16 +115,16 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852 // indirect github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 38215c819dc3..9a762ec6a4c4 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -374,38 +374,38 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go index 4dcf876e27b9..56d63bc1990b 100644 --- a/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go +++ b/receiver/awscontainerinsightreceiver/internal/ecsInfo/ecsinfo.go @@ -80,7 +80,7 @@ type ecsInfoOption func(*EcsInfo) // New creates a k8sApiServer which can generate cluster-level metrics func NewECSInfo(refreshInterval time.Duration, hostIPProvider hostIPProvider, host component.Host, settings component.TelemetrySettings, options ...ecsInfoOption) (*EcsInfo, error) { - setting := confighttp.HTTPClientConfig{ + setting := confighttp.ClientConfig{ Timeout: defaultTimeout, } diff --git a/receiver/awsecscontainermetricsreceiver/factory.go b/receiver/awsecscontainermetricsreceiver/factory.go index 1937790b8584..00e1e3eb26ba 100644 --- a/receiver/awsecscontainermetricsreceiver/factory.go +++ b/receiver/awsecscontainermetricsreceiver/factory.go @@ -50,7 +50,7 @@ func createMetricsReceiver( if err != nil || endpoint == nil { return nil, fmt.Errorf("unable to detect task metadata endpoint: %w", err) } - clientSettings := confighttp.HTTPClientConfig{} + clientSettings := confighttp.ClientConfig{} rest, err := ecsutil.NewRestClient(*endpoint, clientSettings, params.TelemetrySettings) if err != nil { return nil, err diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 42e6685b8b47..8d8193334887 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 0eb1d13f6037..104896eda302 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -73,40 +73,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awsfirehosereceiver/config.go b/receiver/awsfirehosereceiver/config.go index e5b70caa316f..e6de4c2e50ba 100644 --- a/receiver/awsfirehosereceiver/config.go +++ b/receiver/awsfirehosereceiver/config.go @@ -11,10 +11,10 @@ import ( ) type Config struct { - // HTTPServerConfig is used to set up the Firehose delivery + // ServerConfig is used to set up the Firehose delivery // endpoint. The Firehose delivery stream expects an HTTPS // endpoint, so TLSSettings must be used to enable that. - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // RecordType is the key used to determine which unmarshaler to use // when receiving the requests. RecordType string `mapstructure:"record_type"` diff --git a/receiver/awsfirehosereceiver/config_test.go b/receiver/awsfirehosereceiver/config_test.go index 1d4fcc1891e6..2963f517bc16 100644 --- a/receiver/awsfirehosereceiver/config_test.go +++ b/receiver/awsfirehosereceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { require.Equal(t, &Config{ RecordType: "cwmetrics", AccessKey: "some_access_key", - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:4433", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/awsfirehosereceiver/factory.go b/receiver/awsfirehosereceiver/factory.go index 531b81e907dc..a9dcf82bf736 100644 --- a/receiver/awsfirehosereceiver/factory.go +++ b/receiver/awsfirehosereceiver/factory.go @@ -64,7 +64,7 @@ func defaultMetricsUnmarshalers(logger *zap.Logger) map[string]unmarshaler.Metri func createDefaultConfig() component.Config { return &Config{ RecordType: defaultRecordType, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/awsfirehosereceiver/go.mod b/receiver/awsfirehosereceiver/go.mod index 4fc9ec8c09b1..69ec75eb66ec 100644 --- a/receiver/awsfirehosereceiver/go.mod +++ b/receiver/awsfirehosereceiver/go.mod @@ -5,15 +5,15 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,14 +48,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/awsfirehosereceiver/go.sum b/receiver/awsfirehosereceiver/go.sum index 540eaf2b0dec..f39e9190c0df 100644 --- a/receiver/awsfirehosereceiver/go.sum +++ b/receiver/awsfirehosereceiver/go.sum @@ -70,40 +70,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/awsfirehosereceiver/receiver.go b/receiver/awsfirehosereceiver/receiver.go index eac59d5e3b5a..6a4501aa096f 100644 --- a/receiver/awsfirehosereceiver/receiver.go +++ b/receiver/awsfirehosereceiver/receiver.go @@ -111,13 +111,13 @@ func (fmr *firehoseReceiver) Start(_ context.Context, host component.Host) error } var err error - fmr.server, err = fmr.config.HTTPServerConfig.ToServer(host, fmr.settings.TelemetrySettings, fmr) + fmr.server, err = fmr.config.ServerConfig.ToServer(host, fmr.settings.TelemetrySettings, fmr) if err != nil { return err } var listener net.Listener - listener, err = fmr.config.HTTPServerConfig.ToListener() + listener, err = fmr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/awsfirehosereceiver/receiver_test.go b/receiver/awsfirehosereceiver/receiver_test.go index 1364296b35ee..63ebeb5b155c 100644 --- a/receiver/awsfirehosereceiver/receiver_test.go +++ b/receiver/awsfirehosereceiver/receiver_test.go @@ -77,7 +77,7 @@ func TestStart(t *testing.T) { }) cfg := &Config{ RecordType: defaultRecordType, - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: listener.Addr().String(), }, } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index f65d56109694..390318bbd04d 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -53,10 +53,10 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index b16b75b0ce7b..c221d2937238 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -72,30 +72,30 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/azureblobreceiver/go.mod b/receiver/azureblobreceiver/go.mod index 432ba415c1c9..00c2dd322285 100644 --- a/receiver/azureblobreceiver/go.mod +++ b/receiver/azureblobreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -76,15 +76,15 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/azureblobreceiver/go.sum b/receiver/azureblobreceiver/go.sum index 27806c1c4c2d..003bd8c72180 100644 --- a/receiver/azureblobreceiver/go.sum +++ b/receiver/azureblobreceiver/go.sum @@ -194,39 +194,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index ad77fa6bcf57..2f90ca2d7a76 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.93.0 github.com/relvacode/iso8601 v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -80,13 +80,13 @@ require ( github.com/valyala/fastjson v1.6.4 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index e0a30c7ca4ed..7287092c010e 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -189,39 +189,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/azuremonitorreceiver/go.mod b/receiver/azuremonitorreceiver/go.mod index aa53f0d3c506..357861c7eeca 100644 --- a/receiver/azuremonitorreceiver/go.mod +++ b/receiver/azuremonitorreceiver/go.mod @@ -11,11 +11,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,8 +52,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/azuremonitorreceiver/go.sum b/receiver/azuremonitorreceiver/go.sum index fac76847d235..d563cb8bd12c 100644 --- a/receiver/azuremonitorreceiver/go.sum +++ b/receiver/azuremonitorreceiver/go.sum @@ -82,20 +82,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/bigipreceiver/client_test.go b/receiver/bigipreceiver/client_test.go index 9661f790a13b..0353f292f418 100644 --- a/receiver/bigipreceiver/client_test.go +++ b/receiver/bigipreceiver/client_test.go @@ -48,7 +48,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -65,7 +65,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/bigipreceiver/config.go b/receiver/bigipreceiver/config.go index 6f21a9fa474a..5e66b666b5e7 100644 --- a/receiver/bigipreceiver/config.go +++ b/receiver/bigipreceiver/config.go @@ -28,7 +28,7 @@ const defaultEndpoint = "https://localhost:443" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/bigipreceiver/config_test.go b/receiver/bigipreceiver/config_test.go index 797b801bebfc..83f35267e831 100644 --- a/receiver/bigipreceiver/config_test.go +++ b/receiver/bigipreceiver/config_test.go @@ -31,7 +31,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -46,7 +46,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), }, @@ -59,7 +59,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -74,7 +74,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -88,7 +88,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/bigipreceiver/factory.go b/receiver/bigipreceiver/factory.go index c28c140336eb..9f9f40b1da69 100644 --- a/receiver/bigipreceiver/factory.go +++ b/receiver/bigipreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/bigipreceiver/factory_test.go b/receiver/bigipreceiver/factory_test.go index c216cba3d424..6286f39232e3 100644 --- a/receiver/bigipreceiver/factory_test.go +++ b/receiver/bigipreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestNewFactory(t *testing.T) { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/bigipreceiver/go.mod b/receiver/bigipreceiver/go.mod index c61c1e3a6b6d..1fd83dfb7cbc 100644 --- a/receiver/bigipreceiver/go.mod +++ b/receiver/bigipreceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,14 +85,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/bigipreceiver/go.sum b/receiver/bigipreceiver/go.sum index 1a1990444a36..8c328ca9b5bb 100644 --- a/receiver/bigipreceiver/go.sum +++ b/receiver/bigipreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/bigipreceiver/scraper_test.go b/receiver/bigipreceiver/scraper_test.go index f78d8b04f6d7..f7a2c0bea0e8 100644 --- a/receiver/bigipreceiver/scraper_test.go +++ b/receiver/bigipreceiver/scraper_test.go @@ -36,7 +36,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &bigipScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -53,7 +53,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &bigipScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e1e88f5dde05..a449ffe53e98 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/sdk v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index c78f7f0e1875..73a07b4b0796 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -60,24 +60,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/chronyreceiver/go.mod b/receiver/chronyreceiver/go.mod index 18543871032c..310e0d4797cc 100644 --- a/receiver/chronyreceiver/go.mod +++ b/receiver/chronyreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.8.4 github.com/tilinna/clock v1.1.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/chronyreceiver/go.sum b/receiver/chronyreceiver/go.sum index 558c0ce297b8..611d219006cf 100644 --- a/receiver/chronyreceiver/go.sum +++ b/receiver/chronyreceiver/go.sum @@ -71,20 +71,20 @@ 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod index bf1add98d874..eabf9a170cb7 100644 --- a/receiver/cloudflarereceiver/go.mod +++ b/receiver/cloudflarereceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,9 +45,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum index db01af07de9f..032925fb34d8 100644 --- a/receiver/cloudflarereceiver/go.sum +++ b/receiver/cloudflarereceiver/go.sum @@ -63,24 +63,24 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/cloudfoundryreceiver/config.go b/receiver/cloudfoundryreceiver/config.go index 25e5a8a09132..f871288aac18 100644 --- a/receiver/cloudfoundryreceiver/config.go +++ b/receiver/cloudfoundryreceiver/config.go @@ -13,26 +13,26 @@ import ( ) type RLPGatewayConfig struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - ShardID string `mapstructure:"shard_id"` + confighttp.ClientConfig `mapstructure:",squash"` + ShardID string `mapstructure:"shard_id"` } -// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedHTTPClientConfig for more details +// LimitedTLSClientSetting is a subset of TLSClientSetting, see LimitedClientConfig for more details type LimitedTLSClientSetting struct { InsecureSkipVerify bool `mapstructure:"insecure_skip_verify"` } -// LimitedHTTPClientConfig is a subset of HTTPClientConfig, implemented as a separate type due to the library this +// LimitedClientConfig is a subset of ClientConfig, implemented as a separate type due to the library this // configuration is used with not taking a preconfigured http.Client as input, but only taking these specific options -type LimitedHTTPClientConfig struct { +type LimitedClientConfig struct { Endpoint string `mapstructure:"endpoint"` TLSSetting LimitedTLSClientSetting `mapstructure:"tls"` } type UAAConfig struct { - LimitedHTTPClientConfig `mapstructure:",squash"` - Username string `mapstructure:"username"` - Password configopaque.String `mapstructure:"password"` + LimitedClientConfig `mapstructure:",squash"` + Username string `mapstructure:"username"` + Password configopaque.String `mapstructure:"password"` } // Config defines configuration for Collectd receiver. diff --git a/receiver/cloudfoundryreceiver/config_test.go b/receiver/cloudfoundryreceiver/config_test.go index 9d124aae8111..b8083f1da023 100644 --- a/receiver/cloudfoundryreceiver/config_test.go +++ b/receiver/cloudfoundryreceiver/config_test.go @@ -34,7 +34,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "one"), expected: &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", TLSSetting: configtls.TLSClientSetting{ InsecureSkipVerify: true, @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { ShardID: "otel-test", }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: "https://uaa.sys.example.internal", TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: true, @@ -102,17 +102,17 @@ func TestInvalidConfigValidation(t *testing.T) { } func TestHTTPConfigurationStructConsistency(t *testing.T) { - // LimitedHTTPClientConfig must have the same structure as HTTPClientConfig, but without the fields that the UAA + // LimitedClientConfig must have the same structure as ClientConfig, but without the fields that the UAA // library does not support. - checkTypeFieldMatch(t, "Endpoint", reflect.TypeOf(LimitedHTTPClientConfig{}), reflect.TypeOf(confighttp.HTTPClientConfig{})) - checkTypeFieldMatch(t, "TLSSetting", reflect.TypeOf(LimitedHTTPClientConfig{}), reflect.TypeOf(confighttp.HTTPClientConfig{})) + checkTypeFieldMatch(t, "Endpoint", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) + checkTypeFieldMatch(t, "TLSSetting", reflect.TypeOf(LimitedClientConfig{}), reflect.TypeOf(confighttp.ClientConfig{})) checkTypeFieldMatch(t, "InsecureSkipVerify", reflect.TypeOf(LimitedTLSClientSetting{}), reflect.TypeOf(configtls.TLSClientSetting{})) } func loadSuccessfulConfig(t *testing.T) *Config { configuration := &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://log-stream.sys.example.internal", Timeout: time.Second * 20, TLSSetting: configtls.TLSClientSetting{ @@ -122,7 +122,7 @@ func loadSuccessfulConfig(t *testing.T) *Config { ShardID: "otel-test", }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: "https://uaa.sys.example.internal", TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: true, diff --git a/receiver/cloudfoundryreceiver/factory.go b/receiver/cloudfoundryreceiver/factory.go index e738804168ed..38ae50a0c76f 100644 --- a/receiver/cloudfoundryreceiver/factory.go +++ b/receiver/cloudfoundryreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ RLPGateway: RLPGatewayConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultURL, TLSSetting: configtls.TLSClientSetting{ InsecureSkipVerify: false, @@ -43,7 +43,7 @@ func createDefaultConfig() component.Config { ShardID: defaultRLPGatewayShardID, }, UAA: UAAConfig{ - LimitedHTTPClientConfig: LimitedHTTPClientConfig{ + LimitedClientConfig: LimitedClientConfig{ Endpoint: defaultURL, TLSSetting: LimitedTLSClientSetting{ InsecureSkipVerify: false, diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 403b7b85a734..ddc79e929587 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -6,14 +6,14 @@ require ( code.cloudfoundry.org/go-loggregator v7.4.0+incompatible github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index c9d213434942..ee2cb0b809dc 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -108,38 +108,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/cloudfoundryreceiver/receiver.go b/receiver/cloudfoundryreceiver/receiver.go index 2f6d4adbf3cf..702fd87e1058 100644 --- a/receiver/cloudfoundryreceiver/receiver.go +++ b/receiver/cloudfoundryreceiver/receiver.go @@ -66,7 +66,7 @@ func newCloudFoundryReceiver( } func (cfr *cloudFoundryReceiver) Start(ctx context.Context, host component.Host) error { - tokenProvider, tokenErr := newUAATokenProvider(cfr.settings.Logger, cfr.config.UAA.LimitedHTTPClientConfig, cfr.config.UAA.Username, string(cfr.config.UAA.Password)) + tokenProvider, tokenErr := newUAATokenProvider(cfr.settings.Logger, cfr.config.UAA.LimitedClientConfig, cfr.config.UAA.Username, string(cfr.config.UAA.Password)) if tokenErr != nil { return fmt.Errorf("create cloud foundry UAA token provider: %w", tokenErr) } @@ -74,7 +74,7 @@ func (cfr *cloudFoundryReceiver) Start(ctx context.Context, host component.Host) streamFactory, streamErr := newEnvelopeStreamFactory( cfr.settings, tokenProvider, - cfr.config.RLPGateway.HTTPClientConfig, + cfr.config.RLPGateway.ClientConfig, host, ) if streamErr != nil { diff --git a/receiver/cloudfoundryreceiver/stream.go b/receiver/cloudfoundryreceiver/stream.go index fdada0be9006..a5e070272cdd 100644 --- a/receiver/cloudfoundryreceiver/stream.go +++ b/receiver/cloudfoundryreceiver/stream.go @@ -24,7 +24,7 @@ type EnvelopeStreamFactory struct { func newEnvelopeStreamFactory( settings component.TelemetrySettings, authTokenProvider *UAATokenProvider, - httpConfig confighttp.HTTPClientConfig, + httpConfig confighttp.ClientConfig, host component.Host) (*EnvelopeStreamFactory, error) { httpClient, err := httpConfig.ToClient(host, settings) diff --git a/receiver/cloudfoundryreceiver/stream_test.go b/receiver/cloudfoundryreceiver/stream_test.go index 04114afa6600..c146121f26bd 100644 --- a/receiver/cloudfoundryreceiver/stream_test.go +++ b/receiver/cloudfoundryreceiver/stream_test.go @@ -19,7 +19,7 @@ func TestValidStream(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -29,7 +29,7 @@ func TestValidStream(t *testing.T) { streamFactory, streamErr := newEnvelopeStreamFactory( componenttest.NewNopTelemetrySettings(), uaa, - cfg.RLPGateway.HTTPClientConfig, + cfg.RLPGateway.ClientConfig, componenttest.NewNopHost()) require.NoError(t, streamErr) @@ -55,7 +55,7 @@ func TestInvalidStream(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -66,7 +66,7 @@ func TestInvalidStream(t *testing.T) { streamFactory, streamErr := newEnvelopeStreamFactory( componenttest.NewNopTelemetrySettings(), uaa, - cfg.RLPGateway.HTTPClientConfig, + cfg.RLPGateway.ClientConfig, componenttest.NewNopHost()) require.NoError(t, streamErr) diff --git a/receiver/cloudfoundryreceiver/uaa.go b/receiver/cloudfoundryreceiver/uaa.go index 811178b96136..ae7637560449 100644 --- a/receiver/cloudfoundryreceiver/uaa.go +++ b/receiver/cloudfoundryreceiver/uaa.go @@ -28,7 +28,7 @@ type UAATokenProvider struct { mutex *sync.Mutex } -func newUAATokenProvider(logger *zap.Logger, config LimitedHTTPClientConfig, username string, password string) (*UAATokenProvider, error) { +func newUAATokenProvider(logger *zap.Logger, config LimitedClientConfig, username string, password string) (*UAATokenProvider, error) { client, err := uaago.NewClient(config.Endpoint) if err != nil { return nil, err diff --git a/receiver/cloudfoundryreceiver/uaa_test.go b/receiver/cloudfoundryreceiver/uaa_test.go index 1a52338a04e3..738def7213da 100644 --- a/receiver/cloudfoundryreceiver/uaa_test.go +++ b/receiver/cloudfoundryreceiver/uaa_test.go @@ -17,7 +17,7 @@ func TestValidAuthentication(t *testing.T) { uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) @@ -27,7 +27,7 @@ func TestValidAuthentication(t *testing.T) { // No username or password should still succeed uaa, err = newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, "", "") @@ -40,11 +40,11 @@ func TestInvalidAuthentication(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig().(*Config) - cfg.UAA.LimitedHTTPClientConfig.Endpoint = "" + cfg.UAA.LimitedClientConfig.Endpoint = "" uaa, err := newUAATokenProvider( zap.NewNop(), - cfg.UAA.LimitedHTTPClientConfig, + cfg.UAA.LimitedClientConfig, cfg.UAA.Username, string(cfg.UAA.Password)) diff --git a/receiver/collectdreceiver/config.go b/receiver/collectdreceiver/config.go index f0c582df52ac..1d41d3e3bbd1 100644 --- a/receiver/collectdreceiver/config.go +++ b/receiver/collectdreceiver/config.go @@ -13,10 +13,10 @@ import ( // Config defines configuration for Collectd receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - Timeout time.Duration `mapstructure:"timeout"` - Encoding string `mapstructure:"encoding"` - AttributesPrefix string `mapstructure:"attributes_prefix"` + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + Timeout time.Duration `mapstructure:"timeout"` + Encoding string `mapstructure:"encoding"` + AttributesPrefix string `mapstructure:"attributes_prefix"` } func (c *Config) Validate() error { diff --git a/receiver/collectdreceiver/config_test.go b/receiver/collectdreceiver/config_test.go index 23a342496a88..5adedc525f1e 100644 --- a/receiver/collectdreceiver/config_test.go +++ b/receiver/collectdreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "one"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:12345", }, Timeout: 50 * time.Second, diff --git a/receiver/collectdreceiver/factory.go b/receiver/collectdreceiver/factory.go index f461b3de4e03..62f55d0eaa73 100644 --- a/receiver/collectdreceiver/factory.go +++ b/receiver/collectdreceiver/factory.go @@ -31,7 +31,7 @@ func NewFactory() receiver.Factory { } func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: defaultBindEndpoint, }, Timeout: 30 * time.Second, diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index c7ea293df907..4607b5a6fefc 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -8,12 +8,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -49,16 +49,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 68dc45be2c73..6116adc8d8e2 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -70,38 +70,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/collectdreceiver/receiver.go b/receiver/collectdreceiver/receiver.go index 1a80216fb781..50dee268977d 100644 --- a/receiver/collectdreceiver/receiver.go +++ b/receiver/collectdreceiver/receiver.go @@ -58,7 +58,7 @@ func newCollectdReceiver( // Start starts an HTTP server that can process CollectD JSON requests. func (cdr *collectdReceiver) Start(_ context.Context, host component.Host) error { var err error - cdr.server, err = cdr.config.HTTPServerConfig.ToServer(host, cdr.createSettings.TelemetrySettings, cdr) + cdr.server, err = cdr.config.ServerConfig.ToServer(host, cdr.createSettings.TelemetrySettings, cdr) if err != nil { return err } @@ -72,7 +72,7 @@ func (cdr *collectdReceiver) Start(_ context.Context, host component.Host) error if err != nil { return err } - l, err := cdr.config.HTTPServerConfig.ToListener() + l, err := cdr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/collectdreceiver/receiver_test.go b/receiver/collectdreceiver/receiver_test.go index 65bbd3ab46e7..29140c07a88d 100644 --- a/receiver/collectdreceiver/receiver_test.go +++ b/receiver/collectdreceiver/receiver_test.go @@ -47,7 +47,7 @@ func TestNewReceiver(t *testing.T) { name: "nil next Consumer", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: ":0", }, }, @@ -59,7 +59,7 @@ func TestNewReceiver(t *testing.T) { name: "happy path", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: ":0", }, }, @@ -89,7 +89,7 @@ func TestCollectDServer(t *testing.T) { } config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8081", }, } @@ -178,7 +178,7 @@ func TestCollectDServer(t *testing.T) { sink.Reset() req, err := http.NewRequest( tt.HTTPMethod, - "http://"+config.HTTPServerConfig.Endpoint+"?"+tt.QueryParams, + "http://"+config.ServerConfig.Endpoint+"?"+tt.QueryParams, bytes.NewBuffer([]byte(tt.RequestBody)), ) require.NoError(t, err) diff --git a/receiver/couchdbreceiver/client_test.go b/receiver/couchdbreceiver/client_test.go index 7e8bce953427..803eec0603ef 100644 --- a/receiver/couchdbreceiver/client_test.go +++ b/receiver/couchdbreceiver/client_test.go @@ -33,7 +33,7 @@ func TestNewCouchDBClient(t *testing.T) { t.Run("Invalid config", func(t *testing.T) { couchdbClient, err := newCouchDBClient( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -109,7 +109,7 @@ func TestGet(t *testing.T) { url := ts.URL + "/_node/_local/_stats/couchdb" couchdbClient, err := newCouchDBClient( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: url, }, Username: "unauthorized", @@ -182,7 +182,7 @@ func TestBuildReq(t *testing.T) { couchdbClient := couchDBClient{ client: &http.Client{}, cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, Username: "otelu", @@ -204,7 +204,7 @@ func TestBuildBadReq(t *testing.T) { couchdbClient := couchDBClient{ client: &http.Client{}, cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/couchdbreceiver/config.go b/receiver/couchdbreceiver/config.go index 24f97b507cc8..5a47ca552ec2 100644 --- a/receiver/couchdbreceiver/config.go +++ b/receiver/couchdbreceiver/config.go @@ -30,7 +30,7 @@ var ( // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` diff --git a/receiver/couchdbreceiver/config_test.go b/receiver/couchdbreceiver/config_test.go index f98fb6e68387..b7a19667d8c9 100644 --- a/receiver/couchdbreceiver/config_test.go +++ b/receiver/couchdbreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -42,7 +42,7 @@ func TestValidate(t *testing.T) { { desc: "missing password and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -56,7 +56,7 @@ func TestValidate(t *testing.T) { { desc: "missing username and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -72,7 +72,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otel", Password: "otel", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost :5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -84,7 +84,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otel", Password: "otel", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:5984", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/couchdbreceiver/factory.go b/receiver/couchdbreceiver/factory.go index e3d439495b60..de7cf6c8e2a8 100644 --- a/receiver/couchdbreceiver/factory.go +++ b/receiver/couchdbreceiver/factory.go @@ -29,7 +29,7 @@ func createDefaultConfig() component.Config { return &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, Timeout: 1 * time.Minute, diff --git a/receiver/couchdbreceiver/go.mod b/receiver/couchdbreceiver/go.mod index 4176a8325aac..3f6adfdcdc3e 100644 --- a/receiver/couchdbreceiver/go.mod +++ b/receiver/couchdbreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/couchdbreceiver/go.sum b/receiver/couchdbreceiver/go.sum index ee4eee27afb0..90d307dfab2d 100644 --- a/receiver/couchdbreceiver/go.sum +++ b/receiver/couchdbreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/couchdbreceiver/scraper_test.go b/receiver/couchdbreceiver/scraper_test.go index 06ffa5869b19..5f9f8a589c04 100644 --- a/receiver/couchdbreceiver/scraper_test.go +++ b/receiver/couchdbreceiver/scraper_test.go @@ -132,7 +132,7 @@ func TestStart(t *testing.T) { t.Run("start fail", func(t *testing.T) { f := NewFactory() cfg := f.CreateDefaultConfig().(*Config) - cfg.HTTPClientConfig.TLSSetting.CAFile = "/non/existent" + cfg.ClientConfig.TLSSetting.CAFile = "/non/existent" cfg.Username = "otelu" cfg.Password = "otelp" require.NoError(t, component.ValidateConfig(cfg)) @@ -158,7 +158,7 @@ func TestMetricSettings(t *testing.T) { CouchdbHttpdViews: metadata.MetricConfig{Enabled: false}, } cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, MetricsBuilderConfig: mbc, } scraper := newCouchdbScraper(receivertest.NewNopCreateSettings(), cfg) diff --git a/receiver/datadogreceiver/config.go b/receiver/datadogreceiver/config.go index 5e97a84310f5..646309c99763 100644 --- a/receiver/datadogreceiver/config.go +++ b/receiver/datadogreceiver/config.go @@ -11,7 +11,7 @@ import ( ) type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` // ReadTimeout of the http server ReadTimeout time.Duration `mapstructure:"read_timeout"` } diff --git a/receiver/datadogreceiver/factory.go b/receiver/datadogreceiver/factory.go index d4253df480ab..66a467a67e1d 100644 --- a/receiver/datadogreceiver/factory.go +++ b/receiver/datadogreceiver/factory.go @@ -27,7 +27,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8126", }, ReadTimeout: 60 * time.Second, diff --git a/receiver/datadogreceiver/go.mod b/receiver/datadogreceiver/go.mod index 1cc583cf34c3..e35cc86c98b5 100644 --- a/receiver/datadogreceiver/go.mod +++ b/receiver/datadogreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmihailenco/msgpack/v4 v4.3.13 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,17 +51,17 @@ require ( github.com/rs/cors v1.10.1 // indirect github.com/tinylib/msgp v1.1.9 // indirect github.com/vmihailenco/tagparser v0.1.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/datadogreceiver/go.sum b/receiver/datadogreceiver/go.sum index fae2c3318b79..2bb85285f92a 100644 --- a/receiver/datadogreceiver/go.sum +++ b/receiver/datadogreceiver/go.sum @@ -89,40 +89,40 @@ github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgq github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/datadogreceiver/receiver.go b/receiver/datadogreceiver/receiver.go index 2f5dffc05cfb..b6ca43edfeeb 100644 --- a/receiver/datadogreceiver/receiver.go +++ b/receiver/datadogreceiver/receiver.go @@ -55,7 +55,7 @@ func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error ddmux.HandleFunc("/api/v0.2/traces", ddr.handleTraces) var err error - ddr.server, err = ddr.config.HTTPServerConfig.ToServer( + ddr.server, err = ddr.config.ServerConfig.ToServer( host, ddr.params.TelemetrySettings, ddmux, @@ -63,7 +63,7 @@ func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error if err != nil { return fmt.Errorf("failed to create server definition: %w", err) } - hln, err := ddr.config.HTTPServerConfig.ToListener() + hln, err := ddr.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to create datadog listener: %w", err) } diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index f14d4ccaf27f..8e8f20278dc2 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -80,8 +80,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index dd40c7f3e93b..4104200b5367 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -140,24 +140,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/elasticsearchreceiver/client.go b/receiver/elasticsearchreceiver/client.go index b008ab2a109d..864fcb39f5b4 100644 --- a/receiver/elasticsearchreceiver/client.go +++ b/receiver/elasticsearchreceiver/client.go @@ -49,7 +49,7 @@ type defaultElasticsearchClient struct { var _ elasticsearchClient = (*defaultElasticsearchClient)(nil) func newElasticsearchClient(settings component.TelemetrySettings, c Config, h component.Host) (*defaultElasticsearchClient, error) { - client, err := c.HTTPClientConfig.ToClient(h, settings) + client, err := c.ClientConfig.ToClient(h, settings) if err != nil { return nil, err } diff --git a/receiver/elasticsearchreceiver/client_test.go b/receiver/elasticsearchreceiver/client_test.go index ff05bc1e6a5f..452a7c0172cd 100644 --- a/receiver/elasticsearchreceiver/client_test.go +++ b/receiver/elasticsearchreceiver/client_test.go @@ -23,7 +23,7 @@ import ( func TestCreateClientInvalidEndpoint(t *testing.T) { _, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://\x00", }, }, componenttest.NewNopHost()) @@ -40,7 +40,7 @@ func TestNodeStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -62,7 +62,7 @@ func TestNodeStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -85,7 +85,7 @@ func TestNodeStatsNilIOStats(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -111,7 +111,7 @@ func TestNodeStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -131,7 +131,7 @@ func TestNodeStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -147,7 +147,7 @@ func TestNodeStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -170,7 +170,7 @@ func TestClusterHealthNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -196,7 +196,7 @@ func TestClusterHealthAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -216,7 +216,7 @@ func TestClusterHealthNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -232,7 +232,7 @@ func TestClusterHealthNoAuthorization(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -255,7 +255,7 @@ func TestMetadataNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -281,7 +281,7 @@ func TestMetadataAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -301,7 +301,7 @@ func TestMetadataNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -317,7 +317,7 @@ func TestMetadataNoAuthorization(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -332,7 +332,7 @@ func TestMetadataNoAuthorization(t *testing.T) { func TestDoRequestBadPath(t *testing.T) { client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.localhost:9200", }, }, componenttest.NewNopHost()) @@ -344,7 +344,7 @@ func TestDoRequestBadPath(t *testing.T) { func TestDoRequestClientTimeout(t *testing.T) { client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.localhost:9200", }, }, componenttest.NewNopHost()) @@ -362,7 +362,7 @@ func TestDoRequest404(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -383,7 +383,7 @@ func TestIndexStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -405,7 +405,7 @@ func TestIndexStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -431,7 +431,7 @@ func TestIndexStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -451,7 +451,7 @@ func TestIndexStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -467,7 +467,7 @@ func TestIndexStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", @@ -490,7 +490,7 @@ func TestClusterStatsNoPassword(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -512,7 +512,7 @@ func TestClusterStatsNilNodes(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -538,7 +538,7 @@ func TestClusterStatsAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: username, @@ -558,7 +558,7 @@ func TestClusterStatsNoAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, }, componenttest.NewNopHost()) @@ -574,7 +574,7 @@ func TestClusterStatsBadAuthentication(t *testing.T) { defer elasticsearchMock.Close() client, err := newElasticsearchClient(componenttest.NewNopTelemetrySettings(), Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: elasticsearchMock.URL, }, Username: "bad_user", diff --git a/receiver/elasticsearchreceiver/config.go b/receiver/elasticsearchreceiver/config.go index 0a3fcca3855b..711cd4aed6d7 100644 --- a/receiver/elasticsearchreceiver/config.go +++ b/receiver/elasticsearchreceiver/config.go @@ -30,7 +30,7 @@ var ( // Config is the configuration for the elasticsearch receiver type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // MetricsBuilderConfig defines which metrics/attributes to enable for the scraper metadata.MetricsBuilderConfig `mapstructure:",squash"` // Nodes defines the nodes to scrape. diff --git a/receiver/elasticsearchreceiver/config_test.go b/receiver/elasticsearchreceiver/config_test.go index 51c00e18044a..42c9bc1d215e 100644 --- a/receiver/elasticsearchreceiver/config_test.go +++ b/receiver/elasticsearchreceiver/config_test.go @@ -167,7 +167,7 @@ func TestLoadConfig(t *testing.T) { MetricsBuilderConfig: defaultMetrics, Username: "otel", Password: "password", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 10000000000, Endpoint: "http://example.com:9200", }, diff --git a/receiver/elasticsearchreceiver/factory.go b/receiver/elasticsearchreceiver/factory.go index 814ce4832fbd..b64323dac3e9 100644 --- a/receiver/elasticsearchreceiver/factory.go +++ b/receiver/elasticsearchreceiver/factory.go @@ -37,7 +37,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultHTTPClientTimeout, }, diff --git a/receiver/elasticsearchreceiver/go.mod b/receiver/elasticsearchreceiver/go.mod index 02b4bd1b4cf4..b095fab0c0a8 100644 --- a/receiver/elasticsearchreceiver/go.mod +++ b/receiver/elasticsearchreceiver/go.mod @@ -10,15 +10,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -86,13 +86,13 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/elasticsearchreceiver/go.sum b/receiver/elasticsearchreceiver/go.sum index 1a1990444a36..8c328ca9b5bb 100644 --- a/receiver/elasticsearchreceiver/go.sum +++ b/receiver/elasticsearchreceiver/go.sum @@ -147,38 +147,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/elasticsearchreceiver/scraper_test.go b/receiver/elasticsearchreceiver/scraper_test.go index 5ca01f2828e5..74cad46a4440 100644 --- a/receiver/elasticsearchreceiver/scraper_test.go +++ b/receiver/elasticsearchreceiver/scraper_test.go @@ -209,7 +209,7 @@ func TestScraperFailedStart(t *testing.T) { conf := createDefaultConfig().(*Config) - conf.HTTPClientConfig = confighttp.HTTPClientConfig{ + conf.ClientConfig = confighttp.ClientConfig{ Endpoint: "localhost:9200", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/expvarreceiver/config.go b/receiver/expvarreceiver/config.go index e4c9be9b64be..81ad5ba1a0bd 100644 --- a/receiver/expvarreceiver/config.go +++ b/receiver/expvarreceiver/config.go @@ -16,7 +16,7 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/expvarreceiver/config_test.go b/receiver/expvarreceiver/config_test.go index d7c8ca7148ff..098e59b0606f 100644 --- a/receiver/expvarreceiver/config_test.go +++ b/receiver/expvarreceiver/config_test.go @@ -45,7 +45,7 @@ func TestLoadConfig(t *testing.T) { InitialDelay: time.Second, Timeout: time.Second * 5, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:8000/custom/path", Timeout: time.Second * 5, }, diff --git a/receiver/expvarreceiver/factory.go b/receiver/expvarreceiver/factory.go index f32eebb9c142..e617a88d5856 100644 --- a/receiver/expvarreceiver/factory.go +++ b/receiver/expvarreceiver/factory.go @@ -58,7 +58,7 @@ func newMetricsReceiver( func newDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: defaultTimeout, }, diff --git a/receiver/expvarreceiver/factory_test.go b/receiver/expvarreceiver/factory_test.go index d185ecd5b228..0c00df0b6afe 100644 --- a/receiver/expvarreceiver/factory_test.go +++ b/receiver/expvarreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateMetricsReceiver(t *testing.T) { ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/expvarreceiver/go.mod b/receiver/expvarreceiver/go.mod index 3095564a1532..138914c687d7 100644 --- a/receiver/expvarreceiver/go.mod +++ b/receiver/expvarreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,16 +48,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/expvarreceiver/go.sum b/receiver/expvarreceiver/go.sum index 3dbcfbd618af..e907ff4c82dd 100644 --- a/receiver/expvarreceiver/go.sum +++ b/receiver/expvarreceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/expvarreceiver/scraper.go b/receiver/expvarreceiver/scraper.go index 17d693ce8b4b..7fea64fec9b8 100644 --- a/receiver/expvarreceiver/scraper.go +++ b/receiver/expvarreceiver/scraper.go @@ -41,7 +41,7 @@ func newExpVarScraper(cfg *Config, set receiver.CreateSettings) *expVarScraper { } func (e *expVarScraper) start(_ context.Context, host component.Host) error { - client, err := e.cfg.HTTPClientConfig.ToClient(host, e.set.TelemetrySettings) + client, err := e.cfg.ClientConfig.ToClient(host, e.set.TelemetrySettings) if err != nil { return err } diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 656ec963dc63..1445cc712830 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,10 +48,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 248ec0b5aeed..f64eb2fd729f 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -79,24 +79,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/filereceiver/go.mod b/receiver/filereceiver/go.mod index c9785dbad13c..46f43be5897a 100644 --- a/receiver/filereceiver/go.mod +++ b/receiver/filereceiver/go.mod @@ -4,11 +4,11 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -36,7 +36,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filereceiver/go.sum b/receiver/filereceiver/go.sum index b57cf8171f50..5b0ddbddc747 100644 --- a/receiver/filereceiver/go.sum +++ b/receiver/filereceiver/go.sum @@ -59,18 +59,18 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl 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.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/filestatsreceiver/go.mod b/receiver/filestatsreceiver/go.mod index 9ae709557c21..09de6a0e8ec1 100644 --- a/receiver/filestatsreceiver/go.mod +++ b/receiver/filestatsreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/filestatsreceiver/go.sum b/receiver/filestatsreceiver/go.sum index 3c02468dc20a..9009a87df624 100644 --- a/receiver/filestatsreceiver/go.sum +++ b/receiver/filestatsreceiver/go.sum @@ -138,20 +138,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/flinkmetricsreceiver/client_test.go b/receiver/flinkmetricsreceiver/client_test.go index 843c16c7fd6e..73ad35b0a788 100644 --- a/receiver/flinkmetricsreceiver/client_test.go +++ b/receiver/flinkmetricsreceiver/client_test.go @@ -58,7 +58,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -75,7 +75,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/flinkmetricsreceiver/config.go b/receiver/flinkmetricsreceiver/config.go index d1f5b6d70b41..d53245e1a70f 100644 --- a/receiver/flinkmetricsreceiver/config.go +++ b/receiver/flinkmetricsreceiver/config.go @@ -18,7 +18,7 @@ const defaultEndpoint = "http://localhost:8081" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/flinkmetricsreceiver/config_test.go b/receiver/flinkmetricsreceiver/config_test.go index 86b65e5525df..706acf2f6e56 100644 --- a/receiver/flinkmetricsreceiver/config_test.go +++ b/receiver/flinkmetricsreceiver/config_test.go @@ -28,7 +28,7 @@ func TestValidate(t *testing.T) { { desc: "invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -38,7 +38,7 @@ func TestValidate(t *testing.T) { { desc: "valid config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/flinkmetricsreceiver/factory.go b/receiver/flinkmetricsreceiver/factory.go index a38dd96df1f2..2afaf2404179 100644 --- a/receiver/flinkmetricsreceiver/factory.go +++ b/receiver/flinkmetricsreceiver/factory.go @@ -34,7 +34,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/flinkmetricsreceiver/factory_test.go b/receiver/flinkmetricsreceiver/factory_test.go index 239fe074dd18..69fa78b8becc 100644 --- a/receiver/flinkmetricsreceiver/factory_test.go +++ b/receiver/flinkmetricsreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/flinkmetricsreceiver/go.mod b/receiver/flinkmetricsreceiver/go.mod index 36af977ed3b2..5537736f8f30 100644 --- a/receiver/flinkmetricsreceiver/go.mod +++ b/receiver/flinkmetricsreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/flinkmetricsreceiver/go.sum b/receiver/flinkmetricsreceiver/go.sum index ee4eee27afb0..90d307dfab2d 100644 --- a/receiver/flinkmetricsreceiver/go.sum +++ b/receiver/flinkmetricsreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/flinkmetricsreceiver/scraper_test.go b/receiver/flinkmetricsreceiver/scraper_test.go index 41299e511f4a..16ae32076339 100644 --- a/receiver/flinkmetricsreceiver/scraper_test.go +++ b/receiver/flinkmetricsreceiver/scraper_test.go @@ -42,7 +42,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &flinkmetricsScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -59,7 +59,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &flinkmetricsScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index bd8363aa5424..3350deea6275 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/stretchr/testify v1.8.4 github.com/tinylib/msgp v1.1.9 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,8 +43,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index 6e707c4ce54f..96b23df23a65 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -100,20 +100,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/gitproviderreceiver/go.mod b/receiver/gitproviderreceiver/go.mod index acfe63be6b4b..cc85a874c96e 100644 --- a/receiver/gitproviderreceiver/go.mod +++ b/receiver/gitproviderreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/google/go-cmp v0.6.0 github.com/google/go-github/v58 v58.0.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -67,20 +67,20 @@ require ( github.com/vektah/gqlparser/v2 v2.5.11 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/receiver/gitproviderreceiver/go.sum b/receiver/gitproviderreceiver/go.sum index 6a10e8d6e5a3..1d6fdf4e0ddd 100644 --- a/receiver/gitproviderreceiver/go.sum +++ b/receiver/gitproviderreceiver/go.sum @@ -154,53 +154,53 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go index 4ace9e8cc042..79642ed06b1c 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config.go @@ -13,7 +13,7 @@ import ( // Config relating to Github Metric Scraper. type Config struct { metadata.MetricsBuilderConfig `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` internal.ScraperConfig // GitHubOrg is the name of the GitHub organization to srape (github scraper only) GitHubOrg string `mapstructure:"github_org"` diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go index 6cf8b8540fea..9f39b0bca938 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/config_test.go @@ -21,7 +21,7 @@ func TestConfig(t *testing.T) { expectedConfig := &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: 15 * time.Second, }, } diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go index a2a30cad3ad1..f47aa2d7d080 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/factory.go @@ -28,7 +28,7 @@ type Factory struct{} func (f *Factory) CreateDefaultConfig() internal.Config { return &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Timeout: defaultHTTPTimeout, }, } diff --git a/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go b/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go index 606f311d4b83..9a4e53b94130 100644 --- a/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go +++ b/receiver/gitproviderreceiver/internal/scraper/githubscraper/helpers.go @@ -109,7 +109,7 @@ func genDefaultSearchQuery(ownertype string, ghorg string) string { // Returns the graphql and rest clients for GitHub. // By default, the graphql client will use the public GitHub API URL as will // the rest client. If the user has specified an endpoint in the config via the -// inherited HTTPClientConfig, then the both clients will use that endpoint. +// inherited ClientConfig, then the both clients will use that endpoint. // The endpoint defined needs to be the root server. // See the GitHub documentation for more information. // https://docs.github.com/en/graphql/guides/forming-calls-with-graphql#the-graphql-endpoint @@ -119,11 +119,11 @@ func (ghs *githubScraper) createClients() (gClient graphql.Client, rClient *gith rClient = github.NewClient(ghs.client) gClient = graphql.NewClient(defaultGraphURL, ghs.client) - if ghs.cfg.HTTPClientConfig.Endpoint != "" { + if ghs.cfg.ClientConfig.Endpoint != "" { // Given endpoint set as `https://myGHEserver.com` we need to join the path // with `api/graphql` - gu, err := url.JoinPath(ghs.cfg.HTTPClientConfig.Endpoint, "api/graphql") + gu, err := url.JoinPath(ghs.cfg.ClientConfig.Endpoint, "api/graphql") if err != nil { ghs.logger.Sugar().Errorf("error joining graphql endpoint: %v", err) return nil, nil, err @@ -131,7 +131,7 @@ func (ghs *githubScraper) createClients() (gClient graphql.Client, rClient *gith gClient = graphql.NewClient(gu, ghs.client) // The rest client needs the endpoint to be the root of the server - ru := ghs.cfg.HTTPClientConfig.Endpoint + ru := ghs.cfg.ClientConfig.Endpoint rClient, err = github.NewClient(ghs.client).WithEnterpriseURLs(ru, ru) if err != nil { ghs.logger.Sugar().Errorf("error creating enterprise client: %v", err) diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 78d0e307d2be..0060ff32802a 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/iancoleman/strcase v0.3.0 github.com/json-iterator/go v1.1.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -60,10 +60,10 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect go.einride.tech/aip v0.66.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 9071f90e34e1..5a39d3c77bca 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -130,26 +130,26 @@ go.einride.tech/aip v0.66.0 h1:XfV+NQX6L7EOYK11yoHHFtndeaWh3KbD9/cN/6iWEt8= go.einride.tech/aip v0.66.0/go.mod h1:qAhMsfT7plxBX+Oy7Huol6YUvZ0ZzdUz26yZsQwfl1M= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/googlecloudspannerreceiver/go.mod b/receiver/googlecloudspannerreceiver/go.mod index 8eeb60b1a428..ae1a09a7d7d5 100644 --- a/receiver/googlecloudspannerreceiver/go.mod +++ b/receiver/googlecloudspannerreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/ReneKroon/ttlcache/v2 v2.11.0 github.com/mitchellh/hashstructure v1.1.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -61,8 +61,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/googlecloudspannerreceiver/go.sum b/receiver/googlecloudspannerreceiver/go.sum index df3742d4821b..657e5095ce72 100644 --- a/receiver/googlecloudspannerreceiver/go.sum +++ b/receiver/googlecloudspannerreceiver/go.sum @@ -140,20 +140,20 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= diff --git a/receiver/haproxyreceiver/config.go b/receiver/haproxyreceiver/config.go index 7e2336a6a8c1..b141ed3ea2f0 100644 --- a/receiver/haproxyreceiver/config.go +++ b/receiver/haproxyreceiver/config.go @@ -13,13 +13,13 @@ import ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } func (c Config) Validate() error { - if c.HTTPClientConfig.Endpoint == "" { + if c.ClientConfig.Endpoint == "" { return errors.New("'endpoint' cannot be empty") } return nil diff --git a/receiver/haproxyreceiver/go.mod b/receiver/haproxyreceiver/go.mod index cbe96b883e22..42b9d96f971b 100644 --- a/receiver/haproxyreceiver/go.mod +++ b/receiver/haproxyreceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -82,16 +82,16 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/haproxyreceiver/go.sum b/receiver/haproxyreceiver/go.sum index 41de5a28ca60..ae93146cc736 100644 --- a/receiver/haproxyreceiver/go.sum +++ b/receiver/haproxyreceiver/go.sum @@ -146,38 +146,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/haproxyreceiver/scraper.go b/receiver/haproxyreceiver/scraper.go index 036e21660d98..1da146589eb0 100644 --- a/receiver/haproxyreceiver/scraper.go +++ b/receiver/haproxyreceiver/scraper.go @@ -287,7 +287,7 @@ func (s *scraper) readStats(buf []byte) ([]map[string]string, error) { func (s *scraper) start(_ context.Context, host component.Host) error { var err error - s.httpClient, err = s.cfg.HTTPClientConfig.ToClient(host, s.telemetrySettings) + s.httpClient, err = s.cfg.ClientConfig.ToClient(host, s.telemetrySettings) return err } diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index f134be8e7a92..12d47a23d789 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -12,13 +12,13 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 github.com/yusufpapurcu/wmi v1.2.3 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -90,14 +90,14 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 2cace6bca4c0..b17a0161b624 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -325,39 +325,39 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/httpcheckreceiver/config.go b/receiver/httpcheckreceiver/config.go index 5982537b4f13..1da306717bb4 100644 --- a/receiver/httpcheckreceiver/config.go +++ b/receiver/httpcheckreceiver/config.go @@ -29,8 +29,8 @@ type Config struct { } type targetConfig struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` - Method string `mapstructure:"method"` + confighttp.ClientConfig `mapstructure:",squash"` + Method string `mapstructure:"method"` } // Validate validates the configuration by checking for missing or invalid fields diff --git a/receiver/httpcheckreceiver/config_test.go b/receiver/httpcheckreceiver/config_test.go index 3da332ac6d4e..3758afa31ca4 100644 --- a/receiver/httpcheckreceiver/config_test.go +++ b/receiver/httpcheckreceiver/config_test.go @@ -26,7 +26,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, }, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -40,7 +40,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -56,12 +56,12 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:80", }, }, { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -77,7 +77,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "www.opentelemetry.io/docs", }, }, @@ -93,12 +93,12 @@ func TestValidate(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://opentelemetry.io", }, }, { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://opentelemetry.io:80/docs", }, }, diff --git a/receiver/httpcheckreceiver/go.mod b/receiver/httpcheckreceiver/go.mod index 8cecaed7484f..019da4caeee5 100644 --- a/receiver/httpcheckreceiver/go.mod +++ b/receiver/httpcheckreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -50,15 +50,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/httpcheckreceiver/go.sum b/receiver/httpcheckreceiver/go.sum index 3dbcfbd618af..e907ff4c82dd 100644 --- a/receiver/httpcheckreceiver/go.sum +++ b/receiver/httpcheckreceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/httpcheckreceiver/scraper_test.go b/receiver/httpcheckreceiver/scraper_test.go index 9521c1592902..25008541d6aa 100644 --- a/receiver/httpcheckreceiver/scraper_test.go +++ b/receiver/httpcheckreceiver/scraper_test.go @@ -43,7 +43,7 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://example.com", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -64,7 +64,7 @@ func TestScraperStart(t *testing.T) { cfg: &Config{ Targets: []*targetConfig{ { - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: "http://example.com", }, @@ -159,7 +159,7 @@ func TestScaperScrape(t *testing.T) { cfg := createDefaultConfig().(*Config) if len(tc.endpoint) > 0 { cfg.Targets = []*targetConfig{{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: tc.endpoint, }}, } @@ -167,7 +167,7 @@ func TestScaperScrape(t *testing.T) { ms := newMockServer(t, tc.expectedResponse) defer ms.Close() cfg.Targets = []*targetConfig{{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms.URL, }}, } @@ -205,12 +205,12 @@ func TestScraperMultipleTargets(t *testing.T) { defer ms2.Close() cfg.Targets = append(cfg.Targets, &targetConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms1.URL, }, }) cfg.Targets = append(cfg.Targets, &targetConfig{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ms2.URL, }, }) diff --git a/receiver/iisreceiver/go.mod b/receiver/iisreceiver/go.mod index 062f420ea23f..d8701aa58d8a 100644 --- a/receiver/iisreceiver/go.mod +++ b/receiver/iisreceiver/go.mod @@ -9,11 +9,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/iisreceiver/go.sum b/receiver/iisreceiver/go.sum index 4923eeeab27a..428fea028b5b 100644 --- a/receiver/iisreceiver/go.sum +++ b/receiver/iisreceiver/go.sum @@ -136,20 +136,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/influxdbreceiver/config.go b/receiver/influxdbreceiver/config.go index d68a0d716687..a49f169b08d5 100644 --- a/receiver/influxdbreceiver/config.go +++ b/receiver/influxdbreceiver/config.go @@ -9,5 +9,5 @@ import ( // Config defines configuration for the InfluxDB receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` + confighttp.ServerConfig `mapstructure:",squash"` } diff --git a/receiver/influxdbreceiver/factory.go b/receiver/influxdbreceiver/factory.go index d12555f91868..7ec6cc5bbe25 100644 --- a/receiver/influxdbreceiver/factory.go +++ b/receiver/influxdbreceiver/factory.go @@ -27,7 +27,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 80cf201f5bc4..7ff315eabf43 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -56,17 +56,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 53db70d2b9a4..61b2841ec6c8 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -114,40 +114,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/influxdbreceiver/receiver.go b/receiver/influxdbreceiver/receiver.go index 7ed2a4bdafdc..96e241653361 100644 --- a/receiver/influxdbreceiver/receiver.go +++ b/receiver/influxdbreceiver/receiver.go @@ -26,7 +26,7 @@ import ( type metricsReceiver struct { nextConsumer consumer.Metrics - httpServerSettings *confighttp.HTTPServerConfig + httpServerSettings *confighttp.ServerConfig converter *influx2otel.LineProtocolToOtelMetrics server *http.Server @@ -56,7 +56,7 @@ func newMetricsReceiver(config *Config, settings receiver.CreateSettings, nextCo return &metricsReceiver{ nextConsumer: nextConsumer, - httpServerSettings: &config.HTTPServerConfig, + httpServerSettings: &config.ServerConfig, converter: converter, logger: influxLogger, obsrecv: obsrecv, diff --git a/receiver/influxdbreceiver/receiver_test.go b/receiver/influxdbreceiver/receiver_test.go index 29b9d44d6866..34e6fcf67550 100644 --- a/receiver/influxdbreceiver/receiver_test.go +++ b/receiver/influxdbreceiver/receiver_test.go @@ -24,7 +24,7 @@ import ( func TestWriteLineProtocol_v2API(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index d6e2e6a5ab8c..4ed9dda665ca 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -28,18 +28,18 @@ const ( // RemoteSamplingConfig defines config key for remote sampling fetch endpoint type RemoteSamplingConfig struct { - HostEndpoint string `mapstructure:"host_endpoint"` - StrategyFile string `mapstructure:"strategy_file"` - StrategyFileReloadInterval time.Duration `mapstructure:"strategy_file_reload_interval"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` + HostEndpoint string `mapstructure:"host_endpoint"` + StrategyFile string `mapstructure:"strategy_file"` + StrategyFileReloadInterval time.Duration `mapstructure:"strategy_file_reload_interval"` + configgrpc.ClientConfig `mapstructure:",squash"` } // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - ThriftHTTP *confighttp.HTTPServerConfig `mapstructure:"thrift_http"` - ThriftBinary *ProtocolUDP `mapstructure:"thrift_binary"` - ThriftCompact *ProtocolUDP `mapstructure:"thrift_compact"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + ThriftHTTP *confighttp.ServerConfig `mapstructure:"thrift_http"` + ThriftBinary *ProtocolUDP `mapstructure:"thrift_binary"` + ThriftCompact *ProtocolUDP `mapstructure:"thrift_compact"` } // ProtocolUDP is the configuration for a UDP protocol. diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index ec7c046980c8..21265154932a 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -33,13 +33,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: ":3456", }, ThriftCompact: &ProtocolUDP{ @@ -67,13 +67,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", }, ThriftCompact: &ProtocolUDP{ @@ -91,7 +91,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "mixed"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", @@ -108,7 +108,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:9876", Transport: "tcp", @@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) { }, }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: ":3456", }, }, @@ -174,7 +174,7 @@ func TestInvalidConfig(t *testing.T) { { desc: "thrift-http-no-port", apply: func(cfg *Config) { - cfg.ThriftHTTP = &confighttp.HTTPServerConfig{ + cfg.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "localhost:", } }, @@ -201,7 +201,7 @@ func TestInvalidConfig(t *testing.T) { { desc: "grpc-invalid-host", apply: func(cfg *Config) { - cfg.GRPC = &configgrpc.GRPCServerSettings{ + cfg.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "1234", Transport: "tcp", diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index 38f88e9f7581..33545b5074e9 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -73,13 +73,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - ThriftHTTP: &confighttp.HTTPServerConfig{ + ThriftHTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, ThriftBinary: &ProtocolUDP{ @@ -112,11 +112,11 @@ func createTracesReceiver( var config configuration // Set ports if rCfg.Protocols.GRPC != nil { - config.CollectorGRPCServerSettings = *rCfg.Protocols.GRPC + config.GRPCServerConfig = *rCfg.Protocols.GRPC } if rCfg.Protocols.ThriftHTTP != nil { - config.CollectorHTTPSettings = *rCfg.ThriftHTTP + config.HTTPServerConfig = *rCfg.ThriftHTTP } if rCfg.Protocols.ThriftBinary != nil { diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index 5c0bf053ae7f..8069a7bd5467 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -39,7 +39,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() // have to enable at least one protocol for the jaeger receiver to be created - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -80,7 +80,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -90,14 +90,14 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") - assert.Equal(t, "0.0.0.0:14250", r.(*jReceiver).config.CollectorGRPCServerSettings.NetAddr.Endpoint, "grpc port should be default") + assert.Equal(t, "0.0.0.0:14250", r.(*jReceiver).config.GRPCServerConfig.NetAddr.Endpoint, "grpc port should be default") } func TestCreateTLSGPRCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:14250", Transport: "tcp", @@ -119,7 +119,7 @@ func TestCreateTLSThriftHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.ThriftHTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.ThriftHTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:14268", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -143,7 +143,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { r, err := factory.CreateTracesReceiver(context.Background(), set, cfg, nil) assert.NoError(t, err, "unexpected error creating receiver") - assert.Equal(t, "0.0.0.0:14268", r.(*jReceiver).config.CollectorHTTPSettings.Endpoint, "http port should be default") + assert.Equal(t, "0.0.0.0:14268", r.(*jReceiver).config.HTTPServerConfig.Endpoint, "http port should be default") } func TestCreateInvalidThriftBinaryEndpoint(t *testing.T) { diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index 5874b016e2e8..02428eb2afab 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -9,17 +9,17 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -58,14 +58,14 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index 0dacaf660f29..86fd30f46e51 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -104,44 +104,44 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index c5b98832cef2..184acc37a4b0 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -42,8 +42,8 @@ import ( // configuration defines the behavior and the ports that // the Jaeger receiver will use. type configuration struct { - CollectorHTTPSettings confighttp.HTTPServerConfig - CollectorGRPCServerSettings configgrpc.GRPCServerSettings + HTTPServerConfig confighttp.ServerConfig + GRPCServerConfig configgrpc.ServerConfig AgentCompactThrift ProtocolUDP AgentBinaryThrift ProtocolUDP @@ -373,16 +373,16 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er return nil } - if jr.config.CollectorHTTPSettings.Endpoint != "" { - cln, err := jr.config.CollectorHTTPSettings.ToListener() + if jr.config.HTTPServerConfig.Endpoint != "" { + cln, err := jr.config.HTTPServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to Collector address %q: %w", - jr.config.CollectorHTTPSettings.Endpoint, err) + jr.config.HTTPServerConfig.Endpoint, err) } nr := mux.NewRouter() nr.HandleFunc("/api/traces", jr.HandleThriftHTTPBatch).Methods(http.MethodPost) - jr.collectorServer, err = jr.config.CollectorHTTPSettings.ToServer(host, jr.settings.TelemetrySettings, nr) + jr.collectorServer, err = jr.config.HTTPServerConfig.ToServer(host, jr.settings.TelemetrySettings, nr) if err != nil { return err } @@ -396,16 +396,16 @@ func (jr *jReceiver) startCollector(ctx context.Context, host component.Host) er }() } - if jr.config.CollectorGRPCServerSettings.NetAddr.Endpoint != "" { + if jr.config.GRPCServerConfig.NetAddr.Endpoint != "" { var err error - jr.grpc, err = jr.config.CollectorGRPCServerSettings.ToServer(host, jr.settings.TelemetrySettings) + jr.grpc, err = jr.config.GRPCServerConfig.ToServer(host, jr.settings.TelemetrySettings) if err != nil { return fmt.Errorf("failed to build the options for the Jaeger gRPC Collector: %w", err) } - ln, err := jr.config.CollectorGRPCServerSettings.ToListenerContext(ctx) + ln, err := jr.config.GRPCServerConfig.ToListenerContext(ctx) if err != nil { - return fmt.Errorf("failed to bind to gRPC address %q: %w", jr.config.CollectorGRPCServerSettings.NetAddr, err) + return fmt.Errorf("failed to bind to gRPC address %q: %w", jr.config.GRPCServerConfig.NetAddr, err) } api_v2.RegisterCollectorServiceServer(jr.grpc, jr) diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index f70f9ae547d2..2b93b0f4f5dc 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -78,7 +78,7 @@ func TestReception(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) // 1. Create the Jaeger receiver aka "server" config := &configuration{ - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + HTTPServerConfig: confighttp.ServerConfig{ Endpoint: addr, }, } @@ -141,7 +141,7 @@ func TestPortsNotOpen(t *testing.T) { func TestGRPCReception(t *testing.T) { // prepare config := &configuration{ - CollectorGRPCServerSettings: configgrpc.GRPCServerSettings{ + GRPCServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -157,7 +157,7 @@ func TestGRPCReception(t *testing.T) { require.NoError(t, jr.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) - conn, err := grpc.Dial(config.CollectorGRPCServerSettings.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) + conn, err := grpc.Dial(config.GRPCServerConfig.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock()) require.NoError(t, err) defer conn.Close() @@ -195,7 +195,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { }, } - grpcServerSettings := configgrpc.GRPCServerSettings{ + grpcServerSettings := configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -204,7 +204,7 @@ func TestGRPCReceptionWithTLS(t *testing.T) { } config := &configuration{ - CollectorGRPCServerSettings: grpcServerSettings, + GRPCServerConfig: grpcServerSettings, } sink := new(consumertest.TracesSink) @@ -337,7 +337,7 @@ func grpcFixture(t *testing.T, t1 time.Time, d1, d2 time.Duration) *api_v2.PostS func TestSampling(t *testing.T) { config := &configuration{ - CollectorGRPCServerSettings: configgrpc.GRPCServerSettings{NetAddr: confignet.NetAddr{ + GRPCServerConfig: configgrpc.ServerConfig{NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", }}, @@ -351,7 +351,7 @@ func TestSampling(t *testing.T) { require.NoError(t, jr.Start(context.Background(), componenttest.NewNopHost())) t.Cleanup(func() { require.NoError(t, jr.Shutdown(context.Background())) }) - conn, err := grpc.Dial(config.CollectorGRPCServerSettings.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials())) + conn, err := grpc.Dial(config.GRPCServerConfig.NetAddr.Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials())) assert.NoError(t, err) defer conn.Close() diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index c728c343b8a2..938525a0f4a9 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -83,19 +83,19 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 4f07454e176b..4c5e13a50afb 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -153,48 +153,48 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/journaldreceiver/go.mod b/receiver/journaldreceiver/go.mod index 9bfa113a6624..69d5029d15bb 100644 --- a/receiver/journaldreceiver/go.mod +++ b/receiver/journaldreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,11 +43,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/journaldreceiver/go.sum b/receiver/journaldreceiver/go.sum index 4821b6421eeb..676eeb66b740 100644 --- a/receiver/journaldreceiver/go.sum +++ b/receiver/journaldreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 91d396ac88b6..26c96ce49fe9 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -16,13 +16,13 @@ require ( github.com/openshift/api v3.9.0+incompatible github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,19 +84,19 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 28d6c4bcf992..1819312c8f0b 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -301,46 +301,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/k8seventsreceiver/go.mod b/receiver/k8seventsreceiver/go.mod index 56f520164cac..b1adc381dc40 100644 --- a/receiver/k8seventsreceiver/go.mod +++ b/receiver/k8seventsreceiver/go.mod @@ -5,12 +5,12 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -58,8 +58,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/k8seventsreceiver/go.sum b/receiver/k8seventsreceiver/go.sum index 8365ec48582c..ea9a2c01fc03 100644 --- a/receiver/k8seventsreceiver/go.sum +++ b/receiver/k8seventsreceiver/go.sum @@ -258,22 +258,22 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/k8sobjectsreceiver/go.mod b/receiver/k8sobjectsreceiver/go.mod index 228eb583d248..d6db61496eb5 100644 --- a/receiver/k8sobjectsreceiver/go.mod +++ b/receiver/k8sobjectsreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -78,19 +78,19 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/k8sobjectsreceiver/go.sum b/receiver/k8sobjectsreceiver/go.sum index d5142ed755a5..0676f326a75c 100644 --- a/receiver/k8sobjectsreceiver/go.sum +++ b/receiver/k8sobjectsreceiver/go.sum @@ -299,46 +299,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 2695db7eac1f..f36c4064285d 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/google/go-cmp v0.6.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,9 +64,9 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 5086f7696d48..0cbb68e5881d 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -122,24 +122,24 @@ github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gi github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index f63b6f1283e4..002942747fb1 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -17,13 +17,13 @@ require ( github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -74,12 +74,12 @@ require ( github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 221f445ec8ed..2866931142a1 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -162,32 +162,32 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 0004c401ea8a..5c2cd5d9e2b0 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,17 +85,17 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 8a35d9eb75d7..2b1c4b79d87c 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -299,46 +299,46 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= diff --git a/receiver/lokireceiver/config.go b/receiver/lokireceiver/config.go index 21a9bcbda317..66b497f27854 100644 --- a/receiver/lokireceiver/config.go +++ b/receiver/lokireceiver/config.go @@ -20,8 +20,8 @@ const ( // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - HTTP *confighttp.HTTPServerConfig `mapstructure:"http"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + HTTP *confighttp.ServerConfig `mapstructure:"http"` } // Config defines configuration for the lokireceiver receiver. diff --git a/receiver/lokireceiver/config_test.go b/receiver/lokireceiver/config_test.go index 69e780c2d498..da1e9fdd19e1 100644 --- a/receiver/lokireceiver/config_test.go +++ b/receiver/lokireceiver/config_test.go @@ -32,13 +32,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:3600", Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:3500", }, }, @@ -48,13 +48,13 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "mixed"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:4600", Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "localhost:4500", }, }, diff --git a/receiver/lokireceiver/factory.go b/receiver/lokireceiver/factory.go index 6798834b852c..c4cc246b47c2 100644 --- a/receiver/lokireceiver/factory.go +++ b/receiver/lokireceiver/factory.go @@ -37,13 +37,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, }, diff --git a/receiver/lokireceiver/factory_test.go b/receiver/lokireceiver/factory_test.go index 337de8ffcb9c..784662b730bd 100644 --- a/receiver/lokireceiver/factory_test.go +++ b/receiver/lokireceiver/factory_test.go @@ -25,7 +25,7 @@ func TestCreateDefaultConfig(t *testing.T) { func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: defaultGRPCBindEndpoint, Transport: "tcp", diff --git a/receiver/lokireceiver/go.mod b/receiver/lokireceiver/go.mod index fe822636f468..7d881144e6a6 100644 --- a/receiver/lokireceiver/go.mod +++ b/receiver/lokireceiver/go.mod @@ -15,20 +15,20 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/loki v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.93.0 // indirect github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/zap v1.26.0 google.golang.org/grpc v1.61.0 ) require ( - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -66,16 +66,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/prometheus/prometheus v0.48.1 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/lokireceiver/go.sum b/receiver/lokireceiver/go.sum index 8de87f9a4084..ad70d75348c1 100644 --- a/receiver/lokireceiver/go.sum +++ b/receiver/lokireceiver/go.sum @@ -109,44 +109,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/lokireceiver/loki_test.go b/receiver/lokireceiver/loki_test.go index ef465868b479..10dd6d6b2cbe 100644 --- a/receiver/lokireceiver/loki_test.go +++ b/receiver/lokireceiver/loki_test.go @@ -88,7 +88,7 @@ func sendToCollector(endpoint string, contentType string, contentEncoding string func startGRPCServer(t *testing.T) (*grpc.ClientConn, *consumertest.LogsSink) { config := &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", @@ -115,7 +115,7 @@ func startHTTPServer(t *testing.T) (string, *consumertest.LogsSink) { addr := testutil.GetAvailableLocalAddress(t) config := &Config{ Protocols: Protocols{ - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: addr, }, }, diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index b4a71f1425e6..bfc0ce033b90 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -77,8 +77,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index f4f26bdf01ce..baec9b6a14f6 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -138,22 +138,22 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index 8632f02f5591..d010a454db88 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -12,15 +12,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 go.mongodb.org/atlas v0.36.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -60,9 +60,9 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index 27403ac30af4..8b9b15f6fc1b 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -89,30 +89,30 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/atlas v0.36.0 h1:m05S3AO7zkl+bcG1qaNsEKBnAqnKx2FDwLooHpIG3j4= go.mongodb.org/atlas v0.36.0/go.mod h1:nfPldE9dSama6G2IbIzmEza02Ly7yFZjMMVscaM0uEc= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mongodbreceiver/go.mod b/receiver/mongodbreceiver/go.mod index a2adea37f6fb..cbd978f1778c 100644 --- a/receiver/mongodbreceiver/go.mod +++ b/receiver/mongodbreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 go.mongodb.org/mongo-driver v1.13.1 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -90,8 +90,8 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mongodbreceiver/go.sum b/receiver/mongodbreceiver/go.sum index 08a1e73395b4..1897b81a124b 100644 --- a/receiver/mongodbreceiver/go.sum +++ b/receiver/mongodbreceiver/go.sum @@ -159,28 +159,28 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/mysqlreceiver/go.mod b/receiver/mysqlreceiver/go.mod index 94cd97f156ca..f5110a93ed3b 100644 --- a/receiver/mysqlreceiver/go.mod +++ b/receiver/mysqlreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -80,8 +80,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/mysqlreceiver/go.sum b/receiver/mysqlreceiver/go.sum index 7768c948ae23..0ed26c96475c 100644 --- a/receiver/mysqlreceiver/go.sum +++ b/receiver/mysqlreceiver/go.sum @@ -140,26 +140,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/namedpipereceiver/go.mod b/receiver/namedpipereceiver/go.mod index 46f8a31b5ffb..6358a2abd8c7 100644 --- a/receiver/namedpipereceiver/go.mod +++ b/receiver/namedpipereceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -44,11 +44,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/namedpipereceiver/go.sum b/receiver/namedpipereceiver/go.sum index 1b92bba191a1..383e432b84c3 100644 --- a/receiver/namedpipereceiver/go.sum +++ b/receiver/namedpipereceiver/go.sum @@ -76,24 +76,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/nginxreceiver/config.go b/receiver/nginxreceiver/config.go index 3c2e9ad5a65e..8bb500012cc7 100644 --- a/receiver/nginxreceiver/config.go +++ b/receiver/nginxreceiver/config.go @@ -12,6 +12,6 @@ import ( type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:",squash"` } diff --git a/receiver/nginxreceiver/factory.go b/receiver/nginxreceiver/factory.go index 58ac655cad66..5b959c5e256b 100644 --- a/receiver/nginxreceiver/factory.go +++ b/receiver/nginxreceiver/factory.go @@ -30,7 +30,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost:80/status", Timeout: 10 * time.Second, }, diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 912e4b6ef497..78dccb14e47c 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -10,13 +10,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -83,15 +83,15 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index 7184d6052acb..ba56bbb47002 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -148,38 +148,38 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/nginxreceiver/scraper.go b/receiver/nginxreceiver/scraper.go index e57bbf223cf1..731d738420ff 100644 --- a/receiver/nginxreceiver/scraper.go +++ b/receiver/nginxreceiver/scraper.go @@ -53,7 +53,7 @@ func (r *nginxScraper) scrape(context.Context) (pmetric.Metrics, error) { // Init client in scrape method in case there are transient errors in the constructor. if r.client == nil { var err error - r.client, err = client.NewNginxClient(r.httpClient, r.cfg.HTTPClientConfig.Endpoint) + r.client, err = client.NewNginxClient(r.httpClient, r.cfg.ClientConfig.Endpoint) if err != nil { r.client = nil return pmetric.Metrics{}, err diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index c4ef7cc2ae1a..3d4f76110abf 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -58,7 +58,7 @@ func TestScraperError(t *testing.T) { })) t.Run("404", func(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nginxMock.URL + "/badpath", }, }) @@ -70,7 +70,7 @@ func TestScraperError(t *testing.T) { t.Run("parse error", func(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nginxMock.URL + "/status", }, }) @@ -83,7 +83,7 @@ func TestScraperError(t *testing.T) { func TestScraperFailedStart(t *testing.T) { sc := newNginxScraper(receivertest.NewNopCreateSettings(), &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:8080", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/nsxtreceiver/client.go b/receiver/nsxtreceiver/client.go index dec6e50e05ec..da00d474efc3 100644 --- a/receiver/nsxtreceiver/client.go +++ b/receiver/nsxtreceiver/client.go @@ -41,7 +41,7 @@ var ( ) func newClient(c *Config, settings component.TelemetrySettings, host component.Host, logger *zap.Logger) (*nsxClient, error) { - client, err := c.HTTPClientConfig.ToClient(host, settings) + client, err := c.ClientConfig.ToClient(host, settings) if err != nil { return nil, err } diff --git a/receiver/nsxtreceiver/client_test.go b/receiver/nsxtreceiver/client_test.go index 663a4e550861..64d18174b308 100644 --- a/receiver/nsxtreceiver/client_test.go +++ b/receiver/nsxtreceiver/client_test.go @@ -27,7 +27,7 @@ const ( func TestNewClientFailureToParse(t *testing.T) { _, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://\x00", }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -37,7 +37,7 @@ func TestNewClientFailureToParse(t *testing.T) { func TestTransportNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -50,7 +50,7 @@ func TestTransportNodes(t *testing.T) { func TestClusterNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -63,7 +63,7 @@ func TestClusterNodes(t *testing.T) { func TestClusterNodeInterface(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -76,7 +76,7 @@ func TestClusterNodeInterface(t *testing.T) { func TestTransportNodeInterface(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -89,7 +89,7 @@ func TestTransportNodeInterface(t *testing.T) { func TestTransportNodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -102,7 +102,7 @@ func TestTransportNodeStatus(t *testing.T) { func TestClusterNodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -115,7 +115,7 @@ func TestClusterNodeStatus(t *testing.T) { func TestTransportNodeInterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -128,7 +128,7 @@ func TestTransportNodeInterfaceStatus(t *testing.T) { func TestManagerNodeInterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -141,7 +141,7 @@ func TestManagerNodeInterfaceStatus(t *testing.T) { func TestDoRequestBadUrl(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -155,7 +155,7 @@ func TestPermissionDenied_ClusterNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -169,7 +169,7 @@ func TestPermissionDenied_Interfaces(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -183,7 +183,7 @@ func TestPermissionDenied_InterfaceStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -197,7 +197,7 @@ func TestPermissionDenied_NodeStatus(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -211,7 +211,7 @@ func TestPermissionDenied_TransportNodes(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Password: badPassword, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) @@ -225,7 +225,7 @@ func TestInternalServerError(t *testing.T) { nsxMock := mockServer(t) client, err := newClient(&Config{ Username: user500, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: nsxMock.URL, }, }, componenttest.NewNopTelemetrySettings(), componenttest.NewNopHost(), zap.NewNop()) diff --git a/receiver/nsxtreceiver/config.go b/receiver/nsxtreceiver/config.go index 6f093715623f..ea2d8bcd9388 100644 --- a/receiver/nsxtreceiver/config.go +++ b/receiver/nsxtreceiver/config.go @@ -19,7 +19,7 @@ import ( // Config is the configuration for the NSX receiver type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` diff --git a/receiver/nsxtreceiver/config_test.go b/receiver/nsxtreceiver/config_test.go index b85b1091d181..f03765a819d4 100644 --- a/receiver/nsxtreceiver/config_test.go +++ b/receiver/nsxtreceiver/config_test.go @@ -33,7 +33,7 @@ func TestMetricValidation(t *testing.T) { { desc: "not valid scheme", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "wss://not-supported-websockets", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -43,7 +43,7 @@ func TestMetricValidation(t *testing.T) { { desc: "unparseable url", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -54,7 +54,7 @@ func TestMetricValidation(t *testing.T) { desc: "username not provided", cfg: &Config{ Password: "password", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -65,7 +65,7 @@ func TestMetricValidation(t *testing.T) { desc: "password not provided", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/nsxtreceiver/go.mod b/receiver/nsxtreceiver/go.mod index 73bb55e0506a..d02a01048af2 100644 --- a/receiver/nsxtreceiver/go.mod +++ b/receiver/nsxtreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,15 +52,15 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/nsxtreceiver/go.sum b/receiver/nsxtreceiver/go.sum index 2f91b85805db..46e39fa1ccc7 100644 --- a/receiver/nsxtreceiver/go.sum +++ b/receiver/nsxtreceiver/go.sum @@ -82,38 +82,38 @@ github.com/vmware/go-vmware-nsxt v0.0.0-20230223012718-d31b8a1ca05e/go.mod h1:aR github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/nsxtreceiver/scraper_test.go b/receiver/nsxtreceiver/scraper_test.go index ff21cc9eb8ee..8e11a7f15df0 100644 --- a/receiver/nsxtreceiver/scraper_test.go +++ b/receiver/nsxtreceiver/scraper_test.go @@ -106,7 +106,7 @@ func TestStartClientAlreadySet(t *testing.T) { scraper := newScraper( &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: mockClient.URL, }, }, @@ -120,7 +120,7 @@ func TestStartBadUrl(t *testing.T) { scraper := newScraper( &Config{ MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "\x00", }, }, @@ -134,7 +134,7 @@ func TestStartBadUrl(t *testing.T) { func TestScraperRecordNoStat(_ *testing.T) { scraper := newScraper( &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "http://localhost", }, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index f643b368a70d..33d0c601f464 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for OpenCensus receiver. type Config struct { // Configures the receiver server protocol. - configgrpc.GRPCServerSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + configgrpc.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // CorsOrigins are the allowed CORS origins for HTTP/JSON requests to grpc-gateway adapter // for the OpenCensus receiver. See github.com/rs/cors @@ -26,7 +26,7 @@ func (cfg *Config) buildOptions() []ocOption { opts = append(opts, withCorsOrigins(cfg.CorsOrigins)) } - opts = append(opts, withGRPCServerSettings(cfg.GRPCServerSettings)) + opts = append(opts, withGRPCServerSettings(cfg.ServerConfig)) return opts } diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index aee5d331fa65..984cbbc74e1a 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -32,7 +32,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:9090", Transport: "tcp", @@ -44,7 +44,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "keepalive"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "msg-size-conc-connect-max-idle"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -89,7 +89,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tlscredentials"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -107,7 +107,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "cors"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:55678", Transport: "tcp", @@ -120,7 +120,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "uds"), expected: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "/tmp/opencensus.sock", Transport: "unix", diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index dfe3d209faae..b674b935c400 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -30,7 +30,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(grpcPort), Transport: "tcp", diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index d230063f572c..b27c8fc71838 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -44,7 +44,7 @@ func TestCreateTracesReceiver(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", } - defaultGRPCSettings := configgrpc.GRPCServerSettings{ + defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, } tests := []struct { @@ -55,13 +55,13 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "default", cfg: &Config{ - GRPCServerSettings: defaultGRPCSettings, + ServerConfig: defaultGRPCSettings, }, }, { name: "invalid_port", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "localhost:112233", Transport: "tcp", @@ -73,7 +73,7 @@ func TestCreateTracesReceiver(t *testing.T) { { name: "max-msg-size-and-concurrent-connections", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: defaultNetAddr, MaxRecvMsgSizeMiB: 32, MaxConcurrentStreams: 16, @@ -103,7 +103,7 @@ func TestCreateMetricsReceiver(t *testing.T) { Endpoint: testutil.GetAvailableLocalAddress(t), Transport: "tcp", } - defaultGRPCSettings := configgrpc.GRPCServerSettings{ + defaultGRPCSettings := configgrpc.ServerConfig{ NetAddr: defaultNetAddr, } @@ -115,13 +115,13 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "default", cfg: &Config{ - GRPCServerSettings: defaultGRPCSettings, + ServerConfig: defaultGRPCSettings, }, }, { name: "invalid_address", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "327.0.0.1:1122", Transport: "tcp", @@ -133,7 +133,7 @@ func TestCreateMetricsReceiver(t *testing.T) { { name: "keepalive", cfg: &Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ NetAddr: defaultNetAddr, Keepalive: &configgrpc.KeepaliveServerConfig{ ServerParameters: &configgrpc.KeepaliveServerParameters{ diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index ea8d85be13ff..5f7c27ed311b 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -12,14 +12,14 @@ require ( github.com/rs/cors v1.10.1 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 @@ -60,16 +60,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index e3d9116ec839..9d4de7305be9 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -120,42 +120,42 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index fa36aaf37b6e..896dfd7f8c5f 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -36,7 +36,7 @@ type ocReceiver struct { serverHTTP *http.Server gatewayMux *gatewayruntime.ServeMux corsOrigins []string - grpcServerSettings configgrpc.GRPCServerSettings + grpcServerSettings configgrpc.ServerConfig traceReceiver *octrace.Receiver metricsReceiver *ocmetrics.Receiver diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 98a6f812abe0..86a5969e7e89 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -601,7 +601,7 @@ func TestOCReceiverMetrics_HandleNextConsumerResponse(t *testing.T) { func TestInvalidTLSCredentials(t *testing.T) { cfg := Config{ - GRPCServerSettings: configgrpc.GRPCServerSettings{ + ServerConfig: configgrpc.ServerConfig{ TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ CertFile: "willfail", diff --git a/receiver/opencensusreceiver/options.go b/receiver/opencensusreceiver/options.go index 72867d940321..3851fca059f4 100644 --- a/receiver/opencensusreceiver/options.go +++ b/receiver/opencensusreceiver/options.go @@ -30,12 +30,12 @@ func withCorsOrigins(origins []string) ocOption { return &corsOrigins{origins: origins} } -type grpcServerSettings configgrpc.GRPCServerSettings +type grpcServerSettings configgrpc.ServerConfig -func withGRPCServerSettings(settings configgrpc.GRPCServerSettings) ocOption { +func withGRPCServerSettings(settings configgrpc.ServerConfig) ocOption { gsvOpts := grpcServerSettings(settings) return gsvOpts } func (gsvo grpcServerSettings) withReceiver(ocr *ocReceiver) { - ocr.grpcServerSettings = configgrpc.GRPCServerSettings(gsvo) + ocr.grpcServerSettings = configgrpc.ServerConfig(gsvo) } diff --git a/receiver/oracledbreceiver/go.mod b/receiver/oracledbreceiver/go.mod index b30ee707df7b..4682e0fa0670 100644 --- a/receiver/oracledbreceiver/go.mod +++ b/receiver/oracledbreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/google/go-cmp v0.6.0 github.com/sijms/go-ora/v2 v2.8.6 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/oracledbreceiver/go.sum b/receiver/oracledbreceiver/go.sum index d4b83474ebd4..e0d682730c10 100644 --- a/receiver/oracledbreceiver/go.sum +++ b/receiver/oracledbreceiver/go.sum @@ -61,20 +61,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/osqueryreceiver/go.mod b/receiver/osqueryreceiver/go.mod index 13ff9bbf5d77..ff6687200bf8 100644 --- a/receiver/osqueryreceiver/go.mod +++ b/receiver/osqueryreceiver/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -25,11 +25,11 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect diff --git a/receiver/osqueryreceiver/go.sum b/receiver/osqueryreceiver/go.sum index 8d896b3e0ae1..6239d91b02fa 100644 --- a/receiver/osqueryreceiver/go.sum +++ b/receiver/osqueryreceiver/go.sum @@ -49,20 +49,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index b303f38d1e2a..795abc23c976 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,10 +45,10 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index b41191482356..46a35c197ecb 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -77,24 +77,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index 5715070fe1ae..acf2bfa3a05b 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -4,13 +4,13 @@ go 1.20 require ( github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -40,8 +40,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 909ecf79c04e..9f2bf3139e69 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -58,24 +58,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/postgresqlreceiver/go.mod b/receiver/postgresqlreceiver/go.mod index 0dd1083aecc6..24c2ca20aa14 100644 --- a/receiver/postgresqlreceiver/go.mod +++ b/receiver/postgresqlreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -85,8 +85,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/postgresqlreceiver/go.sum b/receiver/postgresqlreceiver/go.sum index 1aea73055c93..6753a8a09b28 100644 --- a/receiver/postgresqlreceiver/go.sum +++ b/receiver/postgresqlreceiver/go.sum @@ -143,28 +143,28 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 53cabaeb0dfb..d1fb08aad25f 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -13,17 +13,17 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -156,19 +156,19 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index 07d82ae3d544..dd8fb0d165a1 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -539,56 +539,56 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/pulsarreceiver/go.mod b/receiver/pulsarreceiver/go.mod index f561edc90d86..f1706c858f72 100644 --- a/receiver/pulsarreceiver/go.mod +++ b/receiver/pulsarreceiver/go.mod @@ -11,13 +11,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -66,7 +66,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/pulsarreceiver/go.sum b/receiver/pulsarreceiver/go.sum index 4aaa7417f5ca..111bb87d088a 100644 --- a/receiver/pulsarreceiver/go.sum +++ b/receiver/pulsarreceiver/go.sum @@ -412,23 +412,23 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/purefareceiver/config.go b/receiver/purefareceiver/config.go index 0b7e2b2aeb36..fe2d0b9e3562 100644 --- a/receiver/purefareceiver/config.go +++ b/receiver/purefareceiver/config.go @@ -18,7 +18,7 @@ var _ component.Config = (*Config)(nil) // Config relating to Array Metric Scraper. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Settings contains settings for the individual scrapers Settings *Settings `mapstructure:"settings"` diff --git a/receiver/purefareceiver/factory.go b/receiver/purefareceiver/factory.go index d743b861bc1d..ff0f87be15dc 100644 --- a/receiver/purefareceiver/factory.go +++ b/receiver/purefareceiver/factory.go @@ -28,8 +28,8 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - ArrayName: "foobar.example.com", - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ArrayName: "foobar.example.com", + ClientConfig: confighttp.ClientConfig{}, Settings: &Settings{ ReloadIntervals: &ReloadIntervals{ Array: 15 * time.Second, diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index bba86f8dd833..4b58486f84c9 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -132,16 +132,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 2a3c189dc886..23f48d2d9562 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/purefbreceiver/config.go b/receiver/purefbreceiver/config.go index a1a7376a6f0b..5e6ce50d35aa 100644 --- a/receiver/purefbreceiver/config.go +++ b/receiver/purefbreceiver/config.go @@ -18,7 +18,7 @@ var _ component.Config = (*Config)(nil) // Config relating to Array Metric Scraper. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` // Settings contains settings for the individual scrapers Settings *Settings `mapstructure:"settings"` diff --git a/receiver/purefbreceiver/factory.go b/receiver/purefbreceiver/factory.go index 5451b501f3da..5795d59e27e2 100644 --- a/receiver/purefbreceiver/factory.go +++ b/receiver/purefbreceiver/factory.go @@ -28,7 +28,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{}, + ClientConfig: confighttp.ClientConfig{}, Settings: &Settings{ ReloadIntervals: &ReloadIntervals{ Array: 15 * time.Second, diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index 84711613c780..6daab3d57490 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -132,16 +132,16 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 2a3c189dc886..23f48d2d9562 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/rabbitmqreceiver/client_test.go b/receiver/rabbitmqreceiver/client_test.go index 19bd97c56fc8..b71f53027b2b 100644 --- a/receiver/rabbitmqreceiver/client_test.go +++ b/receiver/rabbitmqreceiver/client_test.go @@ -39,7 +39,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -56,7 +56,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/rabbitmqreceiver/config.go b/receiver/rabbitmqreceiver/config.go index 1581d94e8ee1..d81af2439331 100644 --- a/receiver/rabbitmqreceiver/config.go +++ b/receiver/rabbitmqreceiver/config.go @@ -29,7 +29,7 @@ const defaultEndpoint = "http://localhost:15672" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` metadata.MetricsBuilderConfig `mapstructure:",squash"` diff --git a/receiver/rabbitmqreceiver/config_test.go b/receiver/rabbitmqreceiver/config_test.go index f15598091f4e..c914ebc30973 100644 --- a/receiver/rabbitmqreceiver/config_test.go +++ b/receiver/rabbitmqreceiver/config_test.go @@ -27,7 +27,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -41,7 +41,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -54,7 +54,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -68,7 +68,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, }, @@ -81,7 +81,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, }, diff --git a/receiver/rabbitmqreceiver/factory.go b/receiver/rabbitmqreceiver/factory.go index e3e33950e9d3..68c7c9489778 100644 --- a/receiver/rabbitmqreceiver/factory.go +++ b/receiver/rabbitmqreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/rabbitmqreceiver/factory_test.go b/receiver/rabbitmqreceiver/factory_test.go index 83a960da6bf7..a6bb4b9b315d 100644 --- a/receiver/rabbitmqreceiver/factory_test.go +++ b/receiver/rabbitmqreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/rabbitmqreceiver/go.mod b/receiver/rabbitmqreceiver/go.mod index 0215323fde4a..878993f9ab8a 100644 --- a/receiver/rabbitmqreceiver/go.mod +++ b/receiver/rabbitmqreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/rabbitmqreceiver/go.sum b/receiver/rabbitmqreceiver/go.sum index ee4eee27afb0..90d307dfab2d 100644 --- a/receiver/rabbitmqreceiver/go.sum +++ b/receiver/rabbitmqreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/rabbitmqreceiver/scraper_test.go b/receiver/rabbitmqreceiver/scraper_test.go index 6e09c2ee56b4..f97c285fbea8 100644 --- a/receiver/rabbitmqreceiver/scraper_test.go +++ b/receiver/rabbitmqreceiver/scraper_test.go @@ -35,7 +35,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &rabbitmqScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -52,7 +52,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &rabbitmqScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index db8b989787bb..3eda452a0f38 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,14 +9,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/spf13/cast v1.6.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -64,13 +64,13 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index b5dcaf5f7323..4b6176dede8b 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -139,39 +139,39 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 4a3bf0d2b36d..84220dd44a29 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,14 +9,14 @@ require ( github.com/redis/go-redis/v9 v9.4.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -81,8 +81,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index f51ca9469227..671187c20274 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -144,26 +144,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/riakreceiver/client_test.go b/receiver/riakreceiver/client_test.go index 8d9e369e0d59..a8967701584f 100644 --- a/receiver/riakreceiver/client_test.go +++ b/receiver/riakreceiver/client_test.go @@ -35,7 +35,7 @@ func TestNewClient(t *testing.T) { { desc: "Invalid HTTP config", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -49,7 +49,7 @@ func TestNewClient(t *testing.T) { { desc: "Valid Configuration", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/riakreceiver/config.go b/receiver/riakreceiver/config.go index 519c07de8e06..24634aca000c 100644 --- a/receiver/riakreceiver/config.go +++ b/receiver/riakreceiver/config.go @@ -29,7 +29,7 @@ const defaultEndpoint = "http://localhost:8098" // Config defines the configuration for the various elements of the receiver agent. type Config struct { scraperhelper.ScraperControllerSettings `mapstructure:",squash"` - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` Username string `mapstructure:"username"` Password configopaque.String `mapstructure:"password"` MetricsBuilderConfig metadata.MetricsBuilderConfig `mapstructure:"metrics"` diff --git a/receiver/riakreceiver/config_test.go b/receiver/riakreceiver/config_test.go index 301cbc66f3bb..62ab4082daf5 100644 --- a/receiver/riakreceiver/config_test.go +++ b/receiver/riakreceiver/config_test.go @@ -24,7 +24,7 @@ func TestValidate(t *testing.T) { { desc: "missing username, password, and invalid endpoint", cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -39,7 +39,7 @@ func TestValidate(t *testing.T) { desc: "missing password and invalid endpoint", cfg: &Config{ Username: "otelu", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -53,7 +53,7 @@ func TestValidate(t *testing.T) { desc: "missing username and invalid endpoint", cfg: &Config{ Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -68,7 +68,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "invalid://endpoint: 12efg", }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), @@ -82,7 +82,7 @@ func TestValidate(t *testing.T) { cfg: &Config{ Username: "otelu", Password: "otelp", - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, }, ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(metadata.Type), diff --git a/receiver/riakreceiver/factory.go b/receiver/riakreceiver/factory.go index bd8d12ed8fb6..07c8d898ed88 100644 --- a/receiver/riakreceiver/factory.go +++ b/receiver/riakreceiver/factory.go @@ -33,7 +33,7 @@ func createDefaultConfig() component.Config { return &Config{ ScraperControllerSettings: cfg, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/riakreceiver/factory_test.go b/receiver/riakreceiver/factory_test.go index 45d1b964d1a2..2ca3de378967 100644 --- a/receiver/riakreceiver/factory_test.go +++ b/receiver/riakreceiver/factory_test.go @@ -40,7 +40,7 @@ func TestNewFactory(t *testing.T) { CollectionInterval: 10 * time.Second, InitialDelay: time.Second, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, Timeout: 10 * time.Second, }, diff --git a/receiver/riakreceiver/go.mod b/receiver/riakreceiver/go.mod index 5b47b880f173..66cfb379628d 100644 --- a/receiver/riakreceiver/go.mod +++ b/receiver/riakreceiver/go.mod @@ -7,14 +7,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,14 +52,14 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/riakreceiver/go.sum b/receiver/riakreceiver/go.sum index ee4eee27afb0..90d307dfab2d 100644 --- a/receiver/riakreceiver/go.sum +++ b/receiver/riakreceiver/go.sum @@ -76,38 +76,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/riakreceiver/scraper_test.go b/receiver/riakreceiver/scraper_test.go index dbd4bc7be14e..a6b65e1632c7 100644 --- a/receiver/riakreceiver/scraper_test.go +++ b/receiver/riakreceiver/scraper_test.go @@ -36,7 +36,7 @@ func TestScraperStart(t *testing.T) { desc: "Bad Config", scraper: &riakScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -54,7 +54,7 @@ func TestScraperStart(t *testing.T) { desc: "Valid Config", scraper: &riakScraper{ cfg: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ TLSSetting: configtls.TLSClientSetting{}, Endpoint: defaultEndpoint, }, diff --git a/receiver/saphanareceiver/go.mod b/receiver/saphanareceiver/go.mod index bfd70612d102..26da2b4509e9 100644 --- a/receiver/saphanareceiver/go.mod +++ b/receiver/saphanareceiver/go.mod @@ -8,14 +8,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -48,8 +48,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/saphanareceiver/go.sum b/receiver/saphanareceiver/go.sum index 59744b15d20d..e7eb2947f3e0 100644 --- a/receiver/saphanareceiver/go.sum +++ b/receiver/saphanareceiver/go.sum @@ -68,26 +68,26 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sapmreceiver/config.go b/receiver/sapmreceiver/config.go index 7314510e28f3..689c8a3399b8 100644 --- a/receiver/sapmreceiver/config.go +++ b/receiver/sapmreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for SAPM receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` } diff --git a/receiver/sapmreceiver/config_test.go b/receiver/sapmreceiver/config_test.go index 3d51a97bd41a..8dda68c3e374 100644 --- a/receiver/sapmreceiver/config_test.go +++ b/receiver/sapmreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", }, }, @@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -57,7 +57,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "passthrough"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7276", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index 508106cb5ea4..367ba31a9e53 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -35,7 +35,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 60d626df371b..6f4a255d66b5 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.93.0 github.com/signalfx/sapm-proto v0.14.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 ) @@ -53,17 +53,17 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index b333a290bf86..af6c81c31ef3 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -82,44 +82,44 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index dfae8ef4ef57..0d7b5be9d00c 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -156,7 +156,7 @@ func (sr *sapmReceiver) Start(_ context.Context, host component.Host) error { return nil } // set up the listener - ln, err := sr.config.HTTPServerConfig.ToListener() + ln, err := sr.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", sr.config.Endpoint, err) } @@ -166,7 +166,7 @@ func (sr *sapmReceiver) Start(_ context.Context, host component.Host) error { nr.HandleFunc(sapmprotocol.TraceEndpointV2, sr.HTTPHandlerFunc) // create a server with the handler - sr.server, err = sr.config.HTTPServerConfig.ToServer(host, sr.settings, nr) + sr.server, err = sr.config.ServerConfig.ToServer(host, sr.settings, nr) if err != nil { return err } diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index 3bc3fbef90dd..4da189a3f6b3 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -278,7 +278,7 @@ func TestReception(t *testing.T) { args: args{ // 1. Create the SAPM receiver aka "server" config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, }, @@ -292,7 +292,7 @@ func TestReception(t *testing.T) { name: "receive compressed sapm", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, }, @@ -306,7 +306,7 @@ func TestReception(t *testing.T) { name: "connect via TLS zstd compressed sapm", args: args{ config: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: tlsAddress, TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -381,7 +381,7 @@ func TestAccessTokenPassthrough(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { config := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:7226", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ diff --git a/receiver/signalfxreceiver/config.go b/receiver/signalfxreceiver/config.go index 56b7824bfaab..5330baccec95 100644 --- a/receiver/signalfxreceiver/config.go +++ b/receiver/signalfxreceiver/config.go @@ -17,18 +17,18 @@ var ( // Config defines configuration for the SignalFx receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` } // Validate verifies that the endpoint is valid and the configured port is not 0 func (rCfg *Config) Validate() error { - if rCfg.HTTPServerConfig.Endpoint == "" { + if rCfg.ServerConfig.Endpoint == "" { return errEmptyEndpoint } - _, err := extractPortFromEndpoint(rCfg.HTTPServerConfig.Endpoint) + _, err := extractPortFromEndpoint(rCfg.ServerConfig.Endpoint) if err != nil { return err } diff --git a/receiver/signalfxreceiver/config_test.go b/receiver/signalfxreceiver/config_test.go index 77609cb36e0d..e1d3f55cca04 100644 --- a/receiver/signalfxreceiver/config_test.go +++ b/receiver/signalfxreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9943", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:9943", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/signalfxreceiver/factory.go b/receiver/signalfxreceiver/factory.go index a026a2afab93..467390d8c5b5 100644 --- a/receiver/signalfxreceiver/factory.go +++ b/receiver/signalfxreceiver/factory.go @@ -38,7 +38,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 74dee6a40c04..3c43386e89f7 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -11,14 +11,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.93.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -66,17 +66,17 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 71719634e876..2fd93ed3d910 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -113,44 +113,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/signalfxreceiver/receiver.go b/receiver/signalfxreceiver/receiver.go index 6867dc32abe2..597679f59233 100644 --- a/receiver/signalfxreceiver/receiver.go +++ b/receiver/signalfxreceiver/receiver.go @@ -125,7 +125,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { } // set up the listener - ln, err := r.config.HTTPServerConfig.ToListener() + ln, err := r.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", r.config.Endpoint, err) } @@ -134,7 +134,7 @@ func (r *sfxReceiver) Start(_ context.Context, host component.Host) error { mx.HandleFunc("/v2/datapoint", r.handleDatapointReq) mx.HandleFunc("/v2/event", r.handleEventReq) - r.server, err = r.config.HTTPServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) + r.server, err = r.config.ServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) if err != nil { return err } diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index 7a9706ef06fa..c5df61a7a8f5 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -67,7 +67,7 @@ func Test_signalfxeceiver_New(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, @@ -536,7 +536,7 @@ func Test_sfxReceiver_TLS(t *testing.T) { addr := testutil.GetAvailableLocalAddress(t) cfg := createDefaultConfig().(*Config) cfg.Endpoint = addr - cfg.HTTPServerConfig.TLSSetting = &configtls.TLSServerSetting{ + cfg.ServerConfig.TLSSetting = &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ CertFile: "./testdata/server.crt", KeyFile: "./testdata/server.key", diff --git a/receiver/simpleprometheusreceiver/config.go b/receiver/simpleprometheusreceiver/config.go index acbf771f5072..e39fd5b7bb42 100644 --- a/receiver/simpleprometheusreceiver/config.go +++ b/receiver/simpleprometheusreceiver/config.go @@ -12,8 +12,8 @@ import ( // Config defines configuration for simple prometheus receiver. type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. - // Deprecated: [v0.55.0] Use confighttp.HTTPClientConfig instead. + confighttp.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + // Deprecated: [v0.55.0] Use confighttp.ClientConfig instead. httpConfig `mapstructure:",squash"` // CollectionInterval is the interval at which metrics should be collected CollectionInterval time.Duration `mapstructure:"collection_interval"` diff --git a/receiver/simpleprometheusreceiver/config_test.go b/receiver/simpleprometheusreceiver/config_test.go index 5bcf1b085b19..9e4f33132319 100644 --- a/receiver/simpleprometheusreceiver/config_test.go +++ b/receiver/simpleprometheusreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "all_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -56,7 +56,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "partial_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -69,7 +69,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "partial_tls_settings"), expected: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", }, CollectionInterval: 30 * time.Second, diff --git a/receiver/simpleprometheusreceiver/factory.go b/receiver/simpleprometheusreceiver/factory.go index f0e999b22052..976ad36d5cc5 100644 --- a/receiver/simpleprometheusreceiver/factory.go +++ b/receiver/simpleprometheusreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index cd48d7e3f6f0..00641c353535 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/prometheus/common v0.46.0 github.com/prometheus/prometheus v0.48.1 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -130,17 +130,17 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/vultr/govultr/v2 v2.17.2 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index c9a756016a48..37030fcd1d87 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -518,47 +518,47 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go index 6fc8abe414de..7fed4cd52ee0 100644 --- a/receiver/simpleprometheusreceiver/receiver.go +++ b/receiver/simpleprometheusreceiver/receiver.go @@ -56,7 +56,7 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component. func getPrometheusConfigWrapper(cfg *Config, params receiver.CreateSettings) (*prometheusreceiver.Config, error) { if cfg.TLSEnabled { params.Logger.Warn("the `tls_config` and 'tls_enabled' settings are deprecated, please use `tls` instead") - cfg.HTTPClientConfig.TLSSetting = configtls.TLSClientSetting{ + cfg.ClientConfig.TLSSetting = configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: cfg.TLSConfig.CAFile, CertFile: cfg.TLSConfig.CertFile, diff --git a/receiver/simpleprometheusreceiver/receiver_test.go b/receiver/simpleprometheusreceiver/receiver_test.go index 89cf08d91320..87e40f01ff0c 100644 --- a/receiver/simpleprometheusreceiver/receiver_test.go +++ b/receiver/simpleprometheusreceiver/receiver_test.go @@ -75,7 +75,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test without TLS", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -113,7 +113,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test with TLS", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", TLSSetting: configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ @@ -158,7 +158,7 @@ func TestGetPrometheusConfig(t *testing.T) { { name: "Test with TLS - default CA", config: &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "localhost:1234", }, CollectionInterval: 10 * time.Second, @@ -219,7 +219,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { InsecureSkipVerify: true, }, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -266,7 +266,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: true, @@ -307,7 +307,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, @@ -348,7 +348,7 @@ func TestGetPrometheusConfigWrapper(t *testing.T) { httpConfig: httpConfig{ TLSEnabled: false, }, - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: defaultEndpoint, TLSSetting: configtls.TLSClientSetting{ Insecure: false, diff --git a/receiver/skywalkingreceiver/config.go b/receiver/skywalkingreceiver/config.go index 0a297425ccd4..02afbd1a8a43 100644 --- a/receiver/skywalkingreceiver/config.go +++ b/receiver/skywalkingreceiver/config.go @@ -19,8 +19,8 @@ const ( // Protocols is the configuration for the supported protocols. type Protocols struct { - GRPC *configgrpc.GRPCServerSettings `mapstructure:"grpc"` - HTTP *confighttp.HTTPServerConfig `mapstructure:"http"` + GRPC *configgrpc.ServerConfig `mapstructure:"grpc"` + HTTP *confighttp.ServerConfig `mapstructure:"http"` } // Config defines configuration for skywalking receiver. diff --git a/receiver/skywalkingreceiver/config_test.go b/receiver/skywalkingreceiver/config_test.go index 0b5dd8e2d9c0..70052571d425 100644 --- a/receiver/skywalkingreceiver/config_test.go +++ b/receiver/skywalkingreceiver/config_test.go @@ -36,7 +36,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ Protocols: Protocols{ - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12801", }, }, @@ -46,7 +46,7 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(metadata.Type, "defaults"), expected: &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", diff --git a/receiver/skywalkingreceiver/factory.go b/receiver/skywalkingreceiver/factory.go index 9b96d191629c..a1f0a493d69a 100644 --- a/receiver/skywalkingreceiver/factory.go +++ b/receiver/skywalkingreceiver/factory.go @@ -46,13 +46,13 @@ func NewFactory() receiver.Factory { func createDefaultConfig() component.Config { return &Config{ Protocols: Protocols{ - GRPC: &configgrpc.GRPCServerSettings{ + GRPC: &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: localhostgate.EndpointForPort(defaultGRPCPort), Transport: "tcp", }, }, - HTTP: &confighttp.HTTPServerConfig{ + HTTP: &confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, }, diff --git a/receiver/skywalkingreceiver/factory_test.go b/receiver/skywalkingreceiver/factory_test.go index 5bae71cfd704..f86c37d0cee3 100644 --- a/receiver/skywalkingreceiver/factory_test.go +++ b/receiver/skywalkingreceiver/factory_test.go @@ -41,7 +41,7 @@ func TestCreateReceiver(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() // have to enable at least one protocol for the skywalking receiver to be created - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -86,7 +86,7 @@ func TestCreateDefaultGRPCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -104,7 +104,7 @@ func TestCreateTLSGPRCEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.(*Config).Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{ Endpoint: "0.0.0.0:11800", Transport: "tcp", @@ -126,7 +126,7 @@ func TestCreateTLSHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.HTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ @@ -146,7 +146,7 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { factory := NewFactory() cfg := factory.CreateDefaultConfig() - cfg.(*Config).Protocols.HTTP = &confighttp.HTTPServerConfig{ + cfg.(*Config).Protocols.HTTP = &confighttp.ServerConfig{ Endpoint: "0.0.0.0:12800", } set := receivertest.NewNopCreateSettings() diff --git a/receiver/skywalkingreceiver/go.mod b/receiver/skywalkingreceiver/go.mod index 356e7e5b9a48..6734dcc79bd6 100644 --- a/receiver/skywalkingreceiver/go.mod +++ b/receiver/skywalkingreceiver/go.mod @@ -8,16 +8,16 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/skywalking v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -58,15 +58,15 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/skywalkingreceiver/go.sum b/receiver/skywalkingreceiver/go.sum index bee1be96cd11..919d8c61f071 100644 --- a/receiver/skywalkingreceiver/go.sum +++ b/receiver/skywalkingreceiver/go.sum @@ -129,44 +129,44 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de 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= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= diff --git a/receiver/skywalkingreceiver/skywalking_receiver.go b/receiver/skywalkingreceiver/skywalking_receiver.go index 7148682547c7..1da974c42fef 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver.go +++ b/receiver/skywalkingreceiver/skywalking_receiver.go @@ -33,9 +33,9 @@ import ( // the Skywalking receiver will use. type configuration struct { CollectorHTTPPort int - CollectorHTTPSettings confighttp.HTTPServerConfig + CollectorHTTPSettings confighttp.ServerConfig CollectorGRPCPort int - CollectorGRPCServerSettings configgrpc.GRPCServerSettings + CollectorGRPCServerSettings configgrpc.ServerConfig } // Receiver type is used to receive spans that were originally intended to be sent to Skywaking. diff --git a/receiver/skywalkingreceiver/skywalking_receiver_test.go b/receiver/skywalkingreceiver/skywalking_receiver_test.go index bebbb0d2efeb..ea8a1d467b4f 100644 --- a/receiver/skywalkingreceiver/skywalking_receiver_test.go +++ b/receiver/skywalkingreceiver/skywalking_receiver_test.go @@ -79,7 +79,7 @@ func TestStartAndShutdown(t *testing.T) { port := 12800 config := &configuration{ CollectorHTTPPort: port, - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + CollectorHTTPSettings: confighttp.ServerConfig{ Endpoint: fmt.Sprintf(":%d", port), }, } @@ -134,7 +134,7 @@ func TestGRPCReception(t *testing.T) { func TestHttpReception(t *testing.T) { config := &configuration{ CollectorHTTPPort: 12800, - CollectorHTTPSettings: confighttp.HTTPServerConfig{ + CollectorHTTPSettings: confighttp.ServerConfig{ Endpoint: fmt.Sprintf(":%d", 12800), }, } diff --git a/receiver/snmpreceiver/go.mod b/receiver/snmpreceiver/go.mod index c33a8f07660a..8e4c9a3b69f2 100644 --- a/receiver/snmpreceiver/go.mod +++ b/receiver/snmpreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,15 +84,15 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.22.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect diff --git a/receiver/snmpreceiver/go.sum b/receiver/snmpreceiver/go.sum index 3c925e8dfd1b..e0e62352da0b 100644 --- a/receiver/snmpreceiver/go.sum +++ b/receiver/snmpreceiver/go.sum @@ -185,41 +185,41 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= go.opentelemetry.io/collector/config/confignet v0.93.0 h1:UZ3ZGxbf0HBCNAIfxhfmVRal5gjDjocVed4NOs89hNo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= go.opentelemetry.io/collector/config/configretry v0.93.0 h1:32JKlZWkGgCLpc1X7rfug6l2zmt8Nz9D2FrwJOVGNx4= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= go.opentelemetry.io/collector/extension/zpagesextension v0.93.0 h1:cOTVR+8HlV5P8/ZNHxNtxcAUqw88InNjGuM8YL4KmnI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/propagators/b3 v1.22.0 h1:Okbgv0pWHMQq+mF7H2o1mucJ5PvxKFq2c8cyqoXfeaQ= diff --git a/receiver/snowflakereceiver/go.mod b/receiver/snowflakereceiver/go.mod index 8b9799245ff4..e82c4334edbf 100644 --- a/receiver/snowflakereceiver/go.mod +++ b/receiver/snowflakereceiver/go.mod @@ -9,12 +9,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/snowflakedb/gosnowflake v1.7.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -81,8 +81,8 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/snowflakereceiver/go.sum b/receiver/snowflakereceiver/go.sum index 06dc07814d5c..4a3b703a305c 100644 --- a/receiver/snowflakereceiver/go.sum +++ b/receiver/snowflakereceiver/go.sum @@ -170,22 +170,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/solacereceiver/go.mod b/receiver/solacereceiver/go.mod index f7a3b0c0396b..4fb96b83c934 100644 --- a/receiver/solacereceiver/go.mod +++ b/receiver/solacereceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/Azure/go-amqp v1.0.4 github.com/stretchr/testify v1.8.4 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -48,7 +48,7 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/solacereceiver/go.sum b/receiver/solacereceiver/go.sum index 642eeac1191c..3dab1df3461a 100644 --- a/receiver/solacereceiver/go.sum +++ b/receiver/solacereceiver/go.sum @@ -102,22 +102,22 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/collector v0.93.0 h1:wnyNd3OjwD7wmTIEVvyZG9cS+dhmfLAhNutWDgE5Vqo= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/splunkenterprisereceiver/client.go b/receiver/splunkenterprisereceiver/client.go index 33d878de6ae4..dcd1ee89f48c 100644 --- a/receiver/splunkenterprisereceiver/client.go +++ b/receiver/splunkenterprisereceiver/client.go @@ -19,7 +19,7 @@ type splunkEntClient struct { } func newSplunkEntClient(cfg *Config, h component.Host, s component.TelemetrySettings) (*splunkEntClient, error) { - client, err := cfg.HTTPClientConfig.ToClient(h, s) + client, err := cfg.ClientConfig.ToClient(h, s) if err != nil { return nil, err } diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 9126cc926616..3c876604227e 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -34,7 +34,7 @@ func (m *mockHost) GetExtensions() map[component.ID]component.Component { func TestClientCreation(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), @@ -65,7 +65,7 @@ func TestClientCreation(t *testing.T) { // ad-hoc searches func TestClientCreateRequest(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), @@ -147,7 +147,7 @@ func TestClientCreateRequest(t *testing.T) { // createAPIRequest creates a request for api calls i.e. to introspection endpoint func TestAPIRequestCreate(t *testing.T) { cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: "https://localhost:8089", Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), diff --git a/receiver/splunkenterprisereceiver/config.go b/receiver/splunkenterprisereceiver/config.go index a058c839bf5b..9720851aa21d 100644 --- a/receiver/splunkenterprisereceiver/config.go +++ b/receiver/splunkenterprisereceiver/config.go @@ -22,7 +22,7 @@ var ( ) type Config struct { - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` scraperhelper.ScraperControllerSettings `mapstructure:",squash"` metadata.MetricsBuilderConfig `mapstructure:",squash"` } @@ -46,7 +46,7 @@ func (cfg *Config) Validate() (errors error) { } } - if cfg.HTTPClientConfig.Auth.AuthenticatorID.Name() == "" { + if cfg.ClientConfig.Auth.AuthenticatorID.Name() == "" { errors = multierr.Append(errors, errMissingAuthExtension) } diff --git a/receiver/splunkenterprisereceiver/factory.go b/receiver/splunkenterprisereceiver/factory.go index 080ccfc2a8e3..ec11df83041a 100644 --- a/receiver/splunkenterprisereceiver/factory.go +++ b/receiver/splunkenterprisereceiver/factory.go @@ -24,7 +24,7 @@ const ( func createDefaultConfig() component.Config { // Default HttpClient settings - httpCfg := confighttp.NewDefaultHTTPClientConfig() + httpCfg := confighttp.NewDefaultClientConfig() httpCfg.Headers = map[string]configopaque.String{ "Content-Type": "application/x-www-form-urlencoded", } @@ -35,7 +35,7 @@ func createDefaultConfig() component.Config { scfg.Timeout = defaultMaxSearchWaitTime return &Config{ - HTTPClientConfig: httpCfg, + ClientConfig: httpCfg, ScraperControllerSettings: scfg, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), } diff --git a/receiver/splunkenterprisereceiver/factory_test.go b/receiver/splunkenterprisereceiver/factory_test.go index 7d38847722db..c0f449f07551 100644 --- a/receiver/splunkenterprisereceiver/factory_test.go +++ b/receiver/splunkenterprisereceiver/factory_test.go @@ -24,13 +24,13 @@ func TestFactoryCreate(t *testing.T) { } func TestDefaultConfig(t *testing.T) { - cfg := confighttp.NewDefaultHTTPClientConfig() + cfg := confighttp.NewDefaultClientConfig() cfg.Headers = map[string]configopaque.String{ "Content-Type": "application/x-www-form-urlencoded", } expectedConf := &Config{ - HTTPClientConfig: cfg, + ClientConfig: cfg, ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ CollectionInterval: 10 * time.Minute, InitialDelay: 1 * time.Second, diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index 10fe9a84f231..e3cab9e9e6f8 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -7,15 +7,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -52,13 +52,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index 3dbcfbd618af..e907ff4c82dd 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -71,38 +71,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index 7626032852b4..8a9a994cde1a 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -84,7 +84,7 @@ func TestScraper(t *testing.T) { metricsettings.Metrics.SplunkServerIntrospectionQueuesCurrentBytes.Enabled = true cfg := &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{ + ClientConfig: confighttp.ClientConfig{ Endpoint: ts.URL, Auth: &configauth.Authentication{ AuthenticatorID: component.NewID("basicauth/client"), diff --git a/receiver/splunkhecreceiver/config.go b/receiver/splunkhecreceiver/config.go index dad82a5470f2..095151aa6288 100644 --- a/receiver/splunkhecreceiver/config.go +++ b/receiver/splunkhecreceiver/config.go @@ -18,7 +18,7 @@ const ( // Config defines configuration for the Splunk HEC receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct splunk.AccessTokenPassthroughConfig `mapstructure:",squash"` // RawPath for raw data collection, default is '/services/collector/raw' diff --git a/receiver/splunkhecreceiver/config_test.go b/receiver/splunkhecreceiver/config_test.go index a7c637733497..22a73fbd3a0d 100644 --- a/receiver/splunkhecreceiver/config_test.go +++ b/receiver/splunkhecreceiver/config_test.go @@ -35,7 +35,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "allsettings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8088", }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{ @@ -55,7 +55,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "tls"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "0.0.0.0:8088", TLSSetting: &configtls.TLSServerSetting{ TLSSetting: configtls.TLSSetting{ diff --git a/receiver/splunkhecreceiver/factory.go b/receiver/splunkhecreceiver/factory.go index 54e68123ad0f..7bce66a2d0bb 100644 --- a/receiver/splunkhecreceiver/factory.go +++ b/receiver/splunkhecreceiver/factory.go @@ -37,7 +37,7 @@ func NewFactory() receiver.Factory { // CreateDefaultConfig creates the default configuration for Splunk HEC receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultPort), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{}, diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index 1ee52e2d4882..06e079823bcd 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -11,15 +11,15 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/zap v1.26.0 @@ -57,16 +57,16 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index ea6c3a2689fe..1d879a595859 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -142,44 +142,44 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/splunkhecreceiver/receiver.go b/receiver/splunkhecreceiver/receiver.go index 7126bc1a42d4..f5db2c7532cd 100644 --- a/receiver/splunkhecreceiver/receiver.go +++ b/receiver/splunkhecreceiver/receiver.go @@ -189,7 +189,7 @@ func (r *splunkReceiver) Start(_ context.Context, host component.Host) error { var ln net.Listener // set up the listener - ln, err := r.config.HTTPServerConfig.ToListener() + ln, err := r.config.ServerConfig.ToListener() if err != nil { return fmt.Errorf("failed to bind to address %s: %w", r.config.Endpoint, err) } @@ -202,7 +202,7 @@ func (r *splunkReceiver) Start(_ context.Context, host component.Host) error { } mx.NewRoute().HandlerFunc(r.handleReq) - r.server, err = r.config.HTTPServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) + r.server, err = r.config.ServerConfig.ToServer(host, r.settings.TelemetrySettings, mx) if err != nil { return err } diff --git a/receiver/splunkhecreceiver/receiver_test.go b/receiver/splunkhecreceiver/receiver_test.go index c596a6bd86fa..716fed93c415 100644 --- a/receiver/splunkhecreceiver/receiver_test.go +++ b/receiver/splunkhecreceiver/receiver_test.go @@ -83,7 +83,7 @@ func Test_splunkhecreceiver_NewLogsReceiver(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, @@ -143,7 +143,7 @@ func Test_splunkhecreceiver_NewMetricsReceiver(t *testing.T) { name: "happy_path", args: args{ config: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:1234", }, }, diff --git a/receiver/sqlqueryreceiver/go.mod b/receiver/sqlqueryreceiver/go.mod index 77d1d78e48ec..5cb5e52f780b 100644 --- a/receiver/sqlqueryreceiver/go.mod +++ b/receiver/sqlqueryreceiver/go.mod @@ -11,12 +11,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/multierr v1.11.0 @@ -132,9 +132,9 @@ require ( github.com/valyala/fastjson v1.6.4 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/sqlqueryreceiver/go.sum b/receiver/sqlqueryreceiver/go.sum index 1fbd2f77608c..2d49ee03930c 100644 --- a/receiver/sqlqueryreceiver/go.sum +++ b/receiver/sqlqueryreceiver/go.sum @@ -288,24 +288,24 @@ github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ= github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sqlserverreceiver/go.mod b/receiver/sqlserverreceiver/go.mod index 16074b803d4d..05646d63e327 100644 --- a/receiver/sqlserverreceiver/go.mod +++ b/receiver/sqlserverreceiver/go.mod @@ -8,11 +8,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/stretchr/objx v0.5.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/sqlserverreceiver/go.sum b/receiver/sqlserverreceiver/go.sum index f8f112373c33..005c6c5aa61a 100644 --- a/receiver/sqlserverreceiver/go.sum +++ b/receiver/sqlserverreceiver/go.sum @@ -64,20 +64,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index 7299dd8ca920..7a37a96caab9 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -8,13 +8,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/pkg/sftp v1.13.6 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.18.0 @@ -25,8 +25,8 @@ require ( github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.0.1 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.93.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect ) diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index f95efc1b615d..5bc80b77d105 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -67,24 +67,24 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index dc62e6a44d6e..605db1008de3 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,13 +7,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel v1.22.0 go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 @@ -46,8 +46,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 507f77ff8648..c868d1f72f12 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -62,25 +62,25 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index 490266d2586c..f61fd19b1576 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,11 +6,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,12 +46,12 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index 82491e7b66c3..bb5283345d8a 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -78,28 +78,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 047adbcbcde2..486cc94c69c9 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -45,13 +45,13 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index 82491e7b66c3..bb5283345d8a 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -78,28 +78,28 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index f73f42f6b443..425f3f3044f9 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -43,11 +43,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 4821b6421eeb..676eeb66b740 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/vcenterreceiver/go.mod b/receiver/vcenterreceiver/go.mod index f658a2720743..cc3a461e526f 100644 --- a/receiver/vcenterreceiver/go.mod +++ b/receiver/vcenterreceiver/go.mod @@ -10,14 +10,14 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/vmware/govmomi v0.34.2 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -84,8 +84,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/vcenterreceiver/go.sum b/receiver/vcenterreceiver/go.sum index fac18b1103c2..9ceb7bd2b39a 100644 --- a/receiver/vcenterreceiver/go.sum +++ b/receiver/vcenterreceiver/go.sum @@ -146,26 +146,26 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 71d887ec9257..45b68f23bfb1 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,12 +7,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -41,9 +41,9 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index c78f7f0e1875..73a07b4b0796 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -60,24 +60,24 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/webhookeventreceiver/config.go b/receiver/webhookeventreceiver/config.go index 7c1ef97175ee..b79570ad9765 100644 --- a/receiver/webhookeventreceiver/config.go +++ b/receiver/webhookeventreceiver/config.go @@ -20,12 +20,12 @@ var ( // Config defines configuration for the Generic Webhook receiver. type Config struct { - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct - ReadTimeout string `mapstructure:"read_timeout"` // wait time for reading request headers in ms. Default is twenty seconds. - WriteTimeout string `mapstructure:"write_timeout"` // wait time for writing request response in ms. Default is twenty seconds. - Path string `mapstructure:"path"` // path for data collection. Default is :/services/collector - HealthPath string `mapstructure:"health_path"` // path for health check api. Default is /services/collector/health - RequiredHeader RequiredHeader `mapstructure:"required_header"` // optional setting to set a required header for all requests to have + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + ReadTimeout string `mapstructure:"read_timeout"` // wait time for reading request headers in ms. Default is twenty seconds. + WriteTimeout string `mapstructure:"write_timeout"` // wait time for writing request response in ms. Default is twenty seconds. + Path string `mapstructure:"path"` // path for data collection. Default is :/services/collector + HealthPath string `mapstructure:"health_path"` // path for health check api. Default is /services/collector/health + RequiredHeader RequiredHeader `mapstructure:"required_header"` // optional setting to set a required header for all requests to have } type RequiredHeader struct { @@ -38,7 +38,7 @@ func (cfg *Config) Validate() error { maxReadWriteTimeout, _ := time.ParseDuration("10s") - if cfg.HTTPServerConfig.Endpoint == "" { + if cfg.ServerConfig.Endpoint == "" { errs = multierr.Append(errs, errMissingEndpointFromConfig) } diff --git a/receiver/webhookeventreceiver/config_test.go b/receiver/webhookeventreceiver/config_test.go index 79f64a455ad3..3e76dff3c5b7 100644 --- a/receiver/webhookeventreceiver/config_test.go +++ b/receiver/webhookeventreceiver/config_test.go @@ -35,7 +35,7 @@ func TestValidateConfig(t *testing.T) { desc: "Missing valid endpoint", expect: errMissingEndpointFromConfig, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, }, @@ -44,7 +44,7 @@ func TestValidateConfig(t *testing.T) { desc: "ReadTimeout exceeds maximum value", expect: errReadTimeoutExceedsMaxValue, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, ReadTimeout: "14s", @@ -54,7 +54,7 @@ func TestValidateConfig(t *testing.T) { desc: "WriteTimeout exceeds maximum value", expect: errWriteTimeoutExceedsMaxValue, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, WriteTimeout: "14s", @@ -64,7 +64,7 @@ func TestValidateConfig(t *testing.T) { desc: "RequiredHeader does not contain both a key and a value", expect: errRequiredHeader, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, RequiredHeader: RequiredHeader{ @@ -77,7 +77,7 @@ func TestValidateConfig(t *testing.T) { desc: "RequiredHeader does not contain both a key and a value", expect: errRequiredHeader, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, RequiredHeader: RequiredHeader{ @@ -90,7 +90,7 @@ func TestValidateConfig(t *testing.T) { desc: "Multiple invalid configs", expect: errs, conf: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, WriteTimeout: "14s", @@ -123,7 +123,7 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) expect := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8080", }, ReadTimeout: "500ms", diff --git a/receiver/webhookeventreceiver/go.mod b/receiver/webhookeventreceiver/go.mod index 7b0ee21dab68..aa2ff068650d 100644 --- a/receiver/webhookeventreceiver/go.mod +++ b/receiver/webhookeventreceiver/go.mod @@ -6,12 +6,12 @@ require ( github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -46,16 +46,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/webhookeventreceiver/go.sum b/receiver/webhookeventreceiver/go.sum index d3b51bd6ad41..424d79b46d8e 100644 --- a/receiver/webhookeventreceiver/go.sum +++ b/receiver/webhookeventreceiver/go.sum @@ -72,38 +72,38 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/webhookeventreceiver/receiver.go b/receiver/webhookeventreceiver/receiver.go index 67b77d1ef980..24cd0a571557 100644 --- a/receiver/webhookeventreceiver/receiver.go +++ b/receiver/webhookeventreceiver/receiver.go @@ -89,7 +89,7 @@ func (er *eventReceiver) Start(_ context.Context, host component.Host) error { } // create listener from config - ln, err := er.cfg.HTTPServerConfig.ToListener() + ln, err := er.cfg.ServerConfig.ToListener() if err != nil { return err } @@ -101,7 +101,7 @@ func (er *eventReceiver) Start(_ context.Context, host component.Host) error { router.GET(er.cfg.HealthPath, er.handleHealthCheck) // webhook server standup and configuration - er.server, err = er.cfg.HTTPServerConfig.ToServer(host, er.settings.TelemetrySettings, router) + er.server, err = er.cfg.ServerConfig.ToServer(host, er.settings.TelemetrySettings, router) if err != nil { return err } diff --git a/receiver/webhookeventreceiver/receiver_test.go b/receiver/webhookeventreceiver/receiver_test.go index d6feac98c5b7..be712a853c8e 100644 --- a/receiver/webhookeventreceiver/receiver_test.go +++ b/receiver/webhookeventreceiver/receiver_test.go @@ -41,7 +41,7 @@ func TestCreateNewLogReceiver(t *testing.T) { { desc: "User defined config success", cfg: Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8080", }, ReadTimeout: "543", diff --git a/receiver/windowseventlogreceiver/go.mod b/receiver/windowseventlogreceiver/go.mod index 6c54bbabb897..de41cde9f7c0 100644 --- a/receiver/windowseventlogreceiver/go.mod +++ b/receiver/windowseventlogreceiver/go.mod @@ -6,10 +6,10 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -44,11 +44,11 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/valyala/fastjson v1.6.4 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/windowseventlogreceiver/go.sum b/receiver/windowseventlogreceiver/go.sum index 4821b6421eeb..676eeb66b740 100644 --- a/receiver/windowseventlogreceiver/go.sum +++ b/receiver/windowseventlogreceiver/go.sum @@ -74,24 +74,24 @@ github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 83892d25366d..97ed93838dbc 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -7,11 +7,11 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.93.0 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -42,8 +42,8 @@ require ( github.com/prometheus/client_model v0.5.0 // indirect github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index c46d2f24aef7..3f9e311f1d42 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -58,20 +58,20 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/receiver/zipkinreceiver/config.go b/receiver/zipkinreceiver/config.go index ea6c8f6b3aac..bd5419568633 100644 --- a/receiver/zipkinreceiver/config.go +++ b/receiver/zipkinreceiver/config.go @@ -11,7 +11,7 @@ import ( // Config defines configuration for Zipkin receiver. type Config struct { // Configures the receiver server protocol. - confighttp.HTTPServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct + confighttp.ServerConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct // If enabled the zipkin receiver will attempt to parse string tags/binary annotations into int/bool/float. // Disabled by default ParseStringTags bool `mapstructure:"parse_string_tags"` diff --git a/receiver/zipkinreceiver/config_test.go b/receiver/zipkinreceiver/config_test.go index c60f358f5cfe..5bd2e350c8ea 100644 --- a/receiver/zipkinreceiver/config_test.go +++ b/receiver/zipkinreceiver/config_test.go @@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "customname"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:8765", }, ParseStringTags: false, @@ -42,7 +42,7 @@ func TestLoadConfig(t *testing.T) { { id: component.NewIDWithName(metadata.Type, "parse_strings"), expected: &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: defaultBindEndpoint, }, ParseStringTags: true, diff --git a/receiver/zipkinreceiver/factory.go b/receiver/zipkinreceiver/factory.go index 8c500bfae9fd..0675a1829e73 100644 --- a/receiver/zipkinreceiver/factory.go +++ b/receiver/zipkinreceiver/factory.go @@ -34,7 +34,7 @@ func NewFactory() receiver.Factory { // createDefaultConfig creates the default configuration for Zipkin receiver. func createDefaultConfig() component.Config { return &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: localhostgate.EndpointForPort(defaultHTTPPort), }, ParseStringTags: false, diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index a0f4be8791a6..0ac5312ae57d 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -9,13 +9,13 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.93.0 github.com/openzipkin/zipkin-go v0.4.2 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -51,16 +51,16 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index 4667b83f2db1..41d3b3144d98 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -78,40 +78,40 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index c5b2c5141e7c..6ca40f7aed55 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -96,13 +96,13 @@ func (zr *zipkinReceiver) Start(_ context.Context, host component.Host) error { } var err error - zr.server, err = zr.config.HTTPServerConfig.ToServer(host, zr.settings.TelemetrySettings, zr) + zr.server, err = zr.config.ServerConfig.ToServer(host, zr.settings.TelemetrySettings, zr) if err != nil { return err } var listener net.Listener - listener, err = zr.config.HTTPServerConfig.ToListener() + listener, err = zr.config.ServerConfig.ToListener() if err != nil { return err } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index f9a94a9aa741..e143f55dd2e8 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -63,7 +63,7 @@ func TestNew(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: tt.args.address, }, } @@ -85,7 +85,7 @@ func TestZipkinReceiverPortAlreadyInUse(t *testing.T) { _, portStr, err := net.SplitHostPort(l.Addr().String()) require.NoError(t, err, "failed to split listener address: %v", err) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:" + portStr, }, } @@ -133,7 +133,7 @@ func TestStartTraceReception(t *testing.T) { t.Run(tt.name, func(t *testing.T) { sink := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:0", }, } @@ -226,7 +226,7 @@ func TestReceiverContentTypes(t *testing.T) { next := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, } @@ -253,7 +253,7 @@ func TestReceiverInvalidContentType(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, } @@ -275,7 +275,7 @@ func TestReceiverConsumerError(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9411", }, } @@ -297,7 +297,7 @@ func TestReceiverConsumerPermanentError(t *testing.T) { r.Header.Add("content-type", "application/json") cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "localhost:9411", }, } @@ -423,7 +423,7 @@ func TestReceiverConvertsStringsToTypes(t *testing.T) { next := new(consumertest.TracesSink) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, ParseStringTags: true, @@ -464,7 +464,7 @@ func TestFromBytesWithNoTimestamp(t *testing.T) { require.NoError(t, err, "Failed to read sample JSON file: %v", err) cfg := &Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: "", }, ParseStringTags: true, diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index b5a73a95d059..76221f598b84 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -10,12 +10,12 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 github.com/stretchr/testify v1.8.4 github.com/testcontainers/testcontainers-go v0.27.0 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/otel/metric v1.22.0 go.opentelemetry.io/otel/trace v1.22.0 go.uber.org/goleak v1.3.0 @@ -78,9 +78,9 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect go.opentelemetry.io/otel/sdk v1.22.0 // indirect diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index e8bb763c9ae4..c1a3787f0228 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -138,24 +138,24 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw= github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= go.opentelemetry.io/otel/exporters/prometheus v0.45.0 h1:BeIK2KGho0oCWa7LxEGSqfDZbs7Fpv/Viz+FS4P8CXE= diff --git a/testbed/datareceivers/jaeger.go b/testbed/datareceivers/jaeger.go index 3cdaf704bbec..8d9adf9a1b43 100644 --- a/testbed/datareceivers/jaeger.go +++ b/testbed/datareceivers/jaeger.go @@ -33,7 +33,7 @@ func NewJaegerDataReceiver(port int) testbed.DataReceiver { func (jr *jaegerDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { factory := jaegerreceiver.NewFactory() cfg := factory.CreateDefaultConfig().(*jaegerreceiver.Config) - cfg.Protocols.GRPC = &configgrpc.GRPCServerSettings{ + cfg.Protocols.GRPC = &configgrpc.ServerConfig{ NetAddr: confignet.NetAddr{Endpoint: fmt.Sprintf("127.0.0.1:%d", jr.Port), Transport: "tcp"}, } var err error diff --git a/testbed/datareceivers/sapm.go b/testbed/datareceivers/sapm.go index 215335da2555..80e993d9dc91 100644 --- a/testbed/datareceivers/sapm.go +++ b/testbed/datareceivers/sapm.go @@ -33,7 +33,7 @@ func NewSapmDataReceiver(port int, compression string) *SapmDataReceiver { // Start the receiver. func (sr *SapmDataReceiver) Start(tc consumer.Traces, _ consumer.Metrics, _ consumer.Logs) error { sapmCfg := sapmreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, AccessTokenPassthroughConfig: splunk.AccessTokenPassthroughConfig{AccessTokenPassthrough: true}, diff --git a/testbed/datareceivers/signalfx.go b/testbed/datareceivers/signalfx.go index 27973cf40ff5..70b8c1a32e17 100644 --- a/testbed/datareceivers/signalfx.go +++ b/testbed/datareceivers/signalfx.go @@ -35,7 +35,7 @@ func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver { // Start the receiver. func (sr *SFxMetricsDataReceiver) Start(_ consumer.Traces, mc consumer.Metrics, _ consumer.Logs) error { config := signalfxreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, } diff --git a/testbed/datareceivers/splunk.go b/testbed/datareceivers/splunk.go index d475618d87d0..46a9b407c6cf 100644 --- a/testbed/datareceivers/splunk.go +++ b/testbed/datareceivers/splunk.go @@ -35,7 +35,7 @@ func NewSplunkHECDataReceiver(port int) *SplunkHECDataReceiver { // Start the receiver. func (sr *SplunkHECDataReceiver) Start(_ consumer.Traces, _ consumer.Metrics, lc consumer.Logs) error { config := splunkhecreceiver.Config{ - HTTPServerConfig: confighttp.HTTPServerConfig{ + ServerConfig: confighttp.ServerConfig{ Endpoint: fmt.Sprintf("127.0.0.1:%d", sr.Port), }, } diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index 9e01992752fd..39f380c5a704 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -79,7 +79,7 @@ type jaegerConfig struct { exporterhelper.QueueSettings `mapstructure:"sending_queue"` configretry.BackOffConfig `mapstructure:"retry_on_failure"` - configgrpc.GRPCClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. + configgrpc.ClientConfig `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. } var _ component.Config = (*jaegerConfig)(nil) @@ -109,7 +109,7 @@ func (je *jaegerGRPCDataSender) newTracesExporter(set exporter.CreateSettings) ( waitForReady: cfg.WaitForReady, connStateReporterInterval: time.Second, stopCh: make(chan struct{}), - clientSettings: &cfg.GRPCClientSettings, + clientSettings: &cfg.ClientConfig, } return exporterhelper.NewTracesExporter( @@ -135,7 +135,7 @@ type protoGRPCSender struct { stopCh chan struct{} stopped bool stopLock sync.Mutex - clientSettings *configgrpc.GRPCClientSettings + clientSettings *configgrpc.ClientConfig } type stateReporter interface { diff --git a/testbed/go.mod b/testbed/go.mod index 2c851560e185..657d8ff67421 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -33,30 +33,30 @@ require ( github.com/prometheus/prometheus v0.48.1 github.com/shirou/gopsutil/v3 v3.23.12 github.com/stretchr/testify v1.8.4 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 - go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb + go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.26.0 @@ -212,15 +212,15 @@ require ( github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/yusufpapurcu/wmi v1.2.3 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect - go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect + go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d // indirect go.opentelemetry.io/contrib/config v0.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect diff --git a/testbed/go.sum b/testbed/go.sum index 46513f52ce34..78b696b74556 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -615,72 +615,72 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f h1:3uNi8JLUGrJAdYkfhjs1bnYg2gBVN/lbpMsrz6jprJs= -go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f h1:k+zyKnjQZIzbv4j2UI56DTUm8t2TCuG9EjWwug8K4pY= -go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f h1:HPzKN+S6hTDdTcB6oxf4StM0EWRpO/uPgJyIaxBLiqQ= -go.opentelemetry.io/collector/connector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f h1:sRJMb9Lw4ywwg0bZPZCneiZRRz3u4HLOUSElZMMMLtU= -go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f h1:+7NTThkyrKPATZ4uBAvU25l+w124nsSC0rg21q+uTL4= -go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f h1:KMACbjhaJE4XRkYs4I9RSE5eaj5j3rFg+5Oox+aQjIc= -go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f h1:N8o/7yGU4aKl6bN98zCYtYFtB7VLEcvEUQq3lCEB9/M= -go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f h1:YZi/DSIbL/7igtiHesuJTe34T+FdipjGRoDx4ITlkcM= -go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f h1:mWiQ8XBU9W7dxtyWHctSqagycluK9y1pelfXrW8h+9M= -go.opentelemetry.io/collector/otelcol v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f h1:uxnhFSB9peafVvsAGVhbCF1hJudye5mg7Bz94b+LSaQ= -go.opentelemetry.io/collector/processor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f h1:LGvY79WzUzK4ITzg9rmKTayk4kz1CDtUdi9bEeO+xn0= -go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f h1:Y4qpdSiDFA9aLDtwsSks/K/mrdFtf83M8DUqT4Oy9Ac= -go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f h1:2C2QYMLF6YrRJPT/9LhRmfJ0wwF8nt4LjBblBCEJZtM= -go.opentelemetry.io/collector/receiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f h1:qPza+9xHzmmUzRowkBJLD0gtLgfwAsQTidfuQjPNQWs= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f h1:hmcWaQ+Lv9nFlYi08SNUlNXfzh7q/W8PAIPWH8XoSXQ= -go.opentelemetry.io/collector/semconv v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f h1:z04ELDKEnY3O8FagzUv59/1OFr3IiwE9QPl8NeQUwlE= -go.opentelemetry.io/collector/service v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d h1:o7SVc+4aEg0k4OrxQr7TivgN/6Jbxt6dhR6Yavn3Doc= +go.opentelemetry.io/collector/config/configgrpc v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RBGOjIkj+3Sb2LGlsS+kawtbCui9c/L2rZYHahNf0kw= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d h1:qOq6w28uuCAQjSx1v45LML02XH58csY3tIPaqq0eQ2w= +go.opentelemetry.io/collector/config/confignet v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rraribsOoZsYZm51+3TXHavmXKJOC5a5/X20vfmNbdw= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d h1:Tg5g+HW2yQwJqVbPp8bdW63dArabWeZt9BYkJuHGCL8= +go.opentelemetry.io/collector/connector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:CJACQS5XfIhJYSumd4Ei64txW1EHVppB5x6gVvxqNfc= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d h1:+A7rBrIrjibME7f0wspuVQot59r+81UqClKVlVJpnkU= +go.opentelemetry.io/collector/exporter/debugexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:PIM4eo+8gaCP1ODrnLx5xzdETCX4fSX81qf/bJlDKtQ= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d h1:EuB1/tq1gR/xTJqsyjrLsIaGhoSZn0xeIZxkwIOLAcc= +go.opentelemetry.io/collector/exporter/otlpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Iz7BOR+JzVoK4ykFXlMtBjLb/dXCmBjgA4W2X7YoT50= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d h1:kmSLoj/Ia9C70yN576YB1lxW57cMfd0iCGf1yPhksC8= +go.opentelemetry.io/collector/exporter/otlphttpexporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:ZBspl77xmCqo+/KJw92AWK7q3nE1oM3lQZpOSKi/xio= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d h1:wjkhjwHGz8bcMAlad5fKRi1PXWimuOwDeG7ynqq7sjE= +go.opentelemetry.io/collector/extension/ballastextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:xtf776sGNmh7Ny6mxUhlygSqIOzVIvkHxCs+tUfQnL0= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d h1:NZ+6B5aLWwEJ6Nbz6jmivGe7E9CXhlc8bkBaRheHTSw= +go.opentelemetry.io/collector/extension/zpagesextension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:M5+XMIf//NX0cumXodiX5a5BNKMcXesoBqZwXjcRGfM= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d h1:qkWJ1uhiV8SrbNgVeff9c458yCaeDAUHGIIEoB5jzBU= +go.opentelemetry.io/collector/otelcol v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:AnAlOGt4q7G0JdU2fceI5vdC6D5omp0GO40wL0aMBak= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d h1:ILGYHz95LJqkr30QbR2cLecksOyXrR7qtXHIk7S/Cv0= +go.opentelemetry.io/collector/processor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:8RhlEB6SZyCTd60aviHxmjbUT2EQ40yXOq6Bea9TOkU= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d h1:nD0O71fKvaQBPuLi3u9bHNMagfLkPJO4C5m8QQYNudE= +go.opentelemetry.io/collector/processor/batchprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:Bpsbv/nRYfmCgjj+WdbOXCi4l7tdWPmU79w1Nv0khRc= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d h1:rHf5AL3jFBmYF75rRjq7mYuLFrTbxwPxwpBk+lcr68s= +go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rfsXJwMIQl7T+l69wUKQ++z0ELptn1K3XiXZ5XzYPCk= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d h1:SuZU5kVrkvYik0ulVwF3yU0kGmhXr7HS9BKAjCnFclQ= +go.opentelemetry.io/collector/receiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:bPAxjHDsXFJZKPAturS7Ar5DDY/HJz5sj73E72vSVqk= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d h1:SHQ0QvG9W1YLCT/+l552VOK9VKIjlQ1+ZdIfwIuTWfo= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:x/04U8TIEFgv0OW6d6mi6PHZLdvOsZ+8xos0ekIAzU4= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d h1:uYTJtEhjiUfHS/gNZqNvCX26vAJa8kLiOcUpmAvqnmw= +go.opentelemetry.io/collector/semconv v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gZ0uzkXsN+J5NpiRcdp9xOhNGQDDui8Y62p15sKrlzo= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d h1:W0E6Spwhf0HHs96uOfdo/1+10l02uHyG8D0hqMmu/uY= +go.opentelemetry.io/collector/service v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:qTiO7dWBfV6tH9fq59cparYQDmG22O+Go+GN69vYMfE= go.opentelemetry.io/contrib/config v0.2.0 h1:VRYXnoE2ug3QOtaKka4eV9OgHXMJ0q6ggFtx6s+Jvy0= go.opentelemetry.io/contrib/config v0.2.0/go.mod h1:iBfwdwpZBKsVXMOAWHyGS8//dcVNJORYnFm6VNqsOG8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/config.go b/testbed/mockdatasenders/mockdatadogagentexporter/config.go index 0153505f378e..be64bb1da143 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/config.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/config.go @@ -12,5 +12,5 @@ import ( type Config struct { component.Config // client to send to the agent - confighttp.HTTPClientConfig `mapstructure:",squash"` + confighttp.ClientConfig `mapstructure:",squash"` } diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/factory.go b/testbed/mockdatasenders/mockdatadogagentexporter/factory.go index 471b2d467971..38b1e12ab9de 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/factory.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/factory.go @@ -31,7 +31,7 @@ func NewFactory() exporter.Factory { // CreateDefaultConfig creates the default configuration for DDAPM Exporter func createDefaultConfig() component.Config { return &Config{ - HTTPClientConfig: confighttp.HTTPClientConfig{Endpoint: "localhost:8126"}, + ClientConfig: confighttp.ClientConfig{Endpoint: "localhost:8126"}, } } diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod index fa1b6a7935f7..c0e66bf6af65 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.mod +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.mod @@ -5,11 +5,11 @@ go 1.20 require ( github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 github.com/tinylib/msgp v1.1.9 - go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f - go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 + go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d + go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb ) require ( @@ -40,18 +40,18 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f // indirect - go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 // indirect + go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d // indirect + go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect go.opentelemetry.io/otel v1.22.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.45.0 // indirect diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum index d77df8117b90..89b42d80e7f5 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/go.sum +++ b/testbed/mockdatasenders/mockdatadogagentexporter/go.sum @@ -102,40 +102,40 @@ github.com/vmihailenco/tagparser v0.1.1 h1:quXMXlA39OCbd2wAdTsGDlK9RkOk6Wuw+x37w github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= 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.93.1-0.20240130182548-89388addcc7f h1:NgQcLNPP/6YnIfNUkDkKu1uiRTXUa9kMtfpsKSVC4dY= -go.opentelemetry.io/collector v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f h1:DNFOx9vwV7g+lWz9htP/Biiwwp+oFifR+J2zKnQKV3U= -go.opentelemetry.io/collector/component v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f h1:3kgTrMN+n+gTgz0t2g+HxKbosnXj3cbTWpKzm5iVrP4= -go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f h1:FI5NTZ1premzy9eb8RlUeSPYzC99owa5C7WWfIuMmSM= -go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f h1:Kp+wFSith3x1WpLlrJKncyfwBIaQYxtMkfIFRBxHnlA= -go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f h1:5wpcYp67vufdi7j6swWWu7K87yiHFoosO/KpuMZtNVA= -go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:dQK8eUXjIGKaw1RB7UIg2nqx56AueNxeKFCdB0P1ypg= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f h1:6n/g6GmXrwZfYfZoIRFLZn5yG9lv9YKaerzmYjLu3lk= -go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f h1:S1mp1jVnxg0tyy7uFEMHDFRqI4AiqqE/ia8RPj3SKW0= -go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f h1:WjsQK6NCASD7Ht/6mdmweFcowBvWf/HiWJASkb4f9rw= -go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:ehXx933OgUTSH7bIWphIf1Kfohy6qmrVHizFCgHtF7U= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f h1:uaN1LYmZkVWolEUVVVoD7xlKq+6hAaQ53CBbtB4OBGk= -go.opentelemetry.io/collector/config/internal v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f h1:HIvqzK7ANxcVRhtJ/zUm+ZWGHlGo7TClqcaNMwQgzHs= -go.opentelemetry.io/collector/confmap v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:KjHrfxKKojaLDc9zDPfVuyp8765AH+XfcoPWMLMiuHU= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f h1:xtOtkpXNP7x+CmP5hpIVNOkfPUQQbWlsjSNUUlczfrE= -go.opentelemetry.io/collector/consumer v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f h1:LxjUUxlAXcQQGQCjB3v+Rzef1M5IMRUdwX2tO82obSw= -go.opentelemetry.io/collector/exporter v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f h1:cBHNixkZij3SmkQSoFLRbVOv7tqsQ9BNE3uSFjQaP30= -go.opentelemetry.io/collector/extension v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f h1:xwtN/kL5zyVROBmQ0kBiOL7pH0H+bVleCbGuB5uATfI= -go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240130182548-89388addcc7f/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5 h1:ksQGFKtMhIeFKuAu5n0teItSFBCMJo1bF5q8YkE/4W4= -go.opentelemetry.io/collector/featuregate v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5 h1:cMc7sJ29OzK5jZqr6XFzKxiJvlypR/zt2TDhPDqpBic= -go.opentelemetry.io/collector/pdata v1.0.2-0.20240130181942-9c7177496fd5/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d h1:r2c6Fwvvb5tyAhvpFdeSL74TAfwSx6w6zrcIkoEFq0c= +go.opentelemetry.io/collector v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rEqeAsOy8Mu6HA6oMjGk7NrTb7958XmShSaapxFEeTs= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d h1:bcfzj+VuZO3+MFhs/wbCDLa1Usbph/00aZ3ljtVs3PU= +go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:jOHaBlhWt4aarDS6w9A9GcgGCxrtEg+8LnBK7Y/6zqo= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d h1:m1KuGvo4syhK/g3nnAJ6qPA94SC4+S5N3EGCAaLfuJc= +go.opentelemetry.io/collector/config/configauth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:HNJs8R2QsUUFTvIECNoQOdGe3bryAC7LdLlf+D36S7M= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d h1:AQ441H/sHnxDpOsK5lYSGPpeYqoHbpaCwU4tcZviLBA= +go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:fA36AZC/Qcyl+HvMnvFZuV/iUWGQJrchimmk+qYWuMM= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d h1:BU5qSrfIN+L/iZYopuyORp5qdmAyy4ISyKFBTyjhUk0= +go.opentelemetry.io/collector/config/confighttp v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:TOo6Nv9g9bmd6Wh7quX715n+Aq0n63aFWKHoSTjzunI= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d h1:Ds93ZkAGPtCIgHZrv5ipPzl23UO0c+PGOf9SwV+5UWY= +go.opentelemetry.io/collector/config/configopaque v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:rdHcb5j3MZHUhYdaPYNejSGQuAz/c4jE0U9J64smhVo= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d h1:KcARjFo7cHCM5lGQ7eEq5oZnW9j8NAkk9ygI+WrUI+U= +go.opentelemetry.io/collector/config/configretry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:gt1HRYyMxcMca9lbDLPbivQzsUCjVjkPAn/3S6fiD14= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d h1:bPyk4F0NyNPHqKFzfaGOVeK3tVaKTuWPgAZPwlJ3Z8Q= +go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:2XLhyR/GVpWeZ2K044vCmrvH/d4Ewt0aD/y46avZyMU= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d h1:9+5iy1j7NynRLEskzPz9/iQOmiQYIrrqrBefmHrUAVc= +go.opentelemetry.io/collector/config/configtls v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:a4PO2jRvx2nREhYJ1S99l1DhVkYtTiR1liOTw793WeM= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d h1:cEQ4NqW//1AiLSZecqhnfB2nbv3/1hALFZWqabSgoF0= +go.opentelemetry.io/collector/config/internal v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:e1lsJgZrO0jpId7iesPp2tljDzJsY4UrggKLfWp53bg= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d h1:mj65lrBNXdayVGeT0bD6elBgVC17Jr2bBKcxGG4YYGE= +go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:XkIj2ynDmZk2hZLAvWuBWTbm5A8n6gDGX0sx2rNnD/w= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d h1:/14bZUww1EbjbNaIfdXESdb+SHpBknAYqR332DZGIaY= +go.opentelemetry.io/collector/consumer v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:RhC4X/bSMIENk68hzFS9i6I7DVsZSfF/S7JvfaqZkkI= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d h1:4gZCxA9PAeo9LfA7rjwjEdLqKOl2nfSjgjQKTXtb2Rc= +go.opentelemetry.io/collector/exporter v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:iqkIF8nB0FkKG2p0oIBLBwT8lQ/Ab4oZ3U9ca9tSoT8= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d h1:2/BMG6/EsphU7YJdRfFXAl6R9SQl1iLN6pe4Ql27m7o= +go.opentelemetry.io/collector/extension v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:vT7HRXtE+5MLesDYDhIf/6cdkAaDCR3ikSlvH6PoA6A= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d h1:0J6231dRkvEAzZvi2oq/sPg6UXatBRYPl6yi01gbOQo= +go.opentelemetry.io/collector/extension/auth v0.93.1-0.20240202170612-7abb9622312d/go.mod h1:hJ6p4yGoJP5zCeKaHV7k8WtRDSAQt20iDWy32gqiXP8= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb h1:DQafqe/uHttedsNPrwD5jB+vyw+Gm2nR1VLt74aV9eg= +go.opentelemetry.io/collector/featuregate v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:QQXjP4etmJQhkQ20j4P/rapWuItYxoFozg/iIwuKnYg= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb h1:UoRa8wN05GuqducCfH/uBwz7fO9KEeBO+nLHy51QgdE= +go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb/go.mod h1:IDkDj+B4Fp4wWOclBELN97zcb98HugJ8Q2gA4ZFsN8Q= go.opentelemetry.io/collector/receiver v0.93.0 h1:oIMAqtG3b3tk+bokCK9T2kAmnFPtYKkph2hmtKcaDR8= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= diff --git a/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go b/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go index 01922ad59ca4..e0eebac45236 100644 --- a/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go +++ b/testbed/mockdatasenders/mockdatadogagentexporter/traces_exporter.go @@ -23,13 +23,13 @@ import ( type ddExporter struct { endpoint string client *http.Client - clientSettings *confighttp.HTTPClientConfig + clientSettings *confighttp.ClientConfig } func createExporter(c *Config) *ddExporter { dd := &ddExporter{ endpoint: c.Endpoint, - clientSettings: &c.HTTPClientConfig, + clientSettings: &c.ClientConfig, client: nil, } From ac90242361021547302c2f062f47c15b06761eff Mon Sep 17 00:00:00 2001 From: Murphy Chen Date: Sat, 3 Feb 2024 04:35:51 +0800 Subject: [PATCH 11/18] [chore] move coralogix exporter to generated lifecycle tests (#30517) Relates to #27849 --------- Co-authored-by: Antoine Toulme --- .../generated_component_test.go | 108 ++++++++++++++++++ exporter/coralogixexporter/go.mod | 12 ++ exporter/coralogixexporter/metadata.yaml | 6 + 3 files changed, 126 insertions(+) create mode 100644 exporter/coralogixexporter/generated_component_test.go diff --git a/exporter/coralogixexporter/generated_component_test.go b/exporter/coralogixexporter/generated_component_test.go new file mode 100644 index 000000000000..6ea095941f58 --- /dev/null +++ b/exporter/coralogixexporter/generated_component_test.go @@ -0,0 +1,108 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package coralogixexporter + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" + + "go.opentelemetry.io/collector/confmap/confmaptest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" +) + +// assertNoErrorHost implements a component.Host that asserts that there were no errors. +type assertNoErrorHost struct { + component.Host + *testing.T +} + +var _ component.Host = (*assertNoErrorHost)(nil) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + }{ + + { + name: "logs", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateLogsExporter(ctx, set, cfg) + }, + }, + + { + name: "metrics", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateMetricsExporter(ctx, set, cfg) + }, + }, + + { + name: "traces", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesExporter(ctx, set, cfg) + }, + }, + } + + 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, component.UnmarshalConfig(sub, cfg)) + + for _, test := range tests { + t.Run(test.name+"-shutdown", func(t *testing.T) { + c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + + t.Run(test.name+"-lifecycle", func(t *testing.T) { + + c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + err = c.Start(context.Background(), host) + require.NoError(t, err) + require.NotPanics(t, func() { + switch e := c.(type) { + case exporter.Logs: + logs := testdata.GenerateLogsManyLogRecordsSameResource(2) + if !e.Capabilities().MutatesData { + logs.MarkReadOnly() + } + err = e.ConsumeLogs(context.Background(), logs) + case exporter.Metrics: + metrics := testdata.GenerateMetricsTwoMetrics() + if !e.Capabilities().MutatesData { + metrics.MarkReadOnly() + } + err = e.ConsumeMetrics(context.Background(), metrics) + case exporter.Traces: + traces := testdata.GenerateTracesTwoSpansSameResource() + if !e.Capabilities().MutatesData { + traces.MarkReadOnly() + } + err = e.ConsumeTraces(context.Background(), traces) + } + }) + + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + } +} diff --git a/exporter/coralogixexporter/go.mod b/exporter/coralogixexporter/go.mod index 968ec1cebc0e..ec5e574550d8 100644 --- a/exporter/coralogixexporter/go.mod +++ b/exporter/coralogixexporter/go.mod @@ -4,6 +4,7 @@ go 1.20 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.93.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/collector/config/configcompression v0.93.1-0.20240202170612-7abb9622312d @@ -72,6 +73,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) +// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules +replace cloud.google.com/go v0.65.0 => cloud.google.com/go v0.110.10 + replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common retract ( @@ -79,3 +83,11 @@ retract ( v0.76.1 v0.65.0 ) + +replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal + +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil + +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest + +replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden diff --git a/exporter/coralogixexporter/metadata.yaml b/exporter/coralogixexporter/metadata.yaml index ccabecdfa22d..b5e7471d42d2 100644 --- a/exporter/coralogixexporter/metadata.yaml +++ b/exporter/coralogixexporter/metadata.yaml @@ -7,3 +7,9 @@ status: distributions: [contrib, observiq] codeowners: active: [povilasv, matej-g] + +tests: + config: + domain: "coralogix.com" + private_key: "xxx" + expect_consumer_error: true \ No newline at end of file From 3efc3e4cc0964e1b439c3cd5eb197d166dc29433 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:39:15 -0800 Subject: [PATCH 12/18] fix(deps): update module github.com/relvacode/iso8601 to v1.4.0 (#30882) 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/relvacode/iso8601](https://togithub.com/relvacode/iso8601) | `v1.3.0` -> `v1.4.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2frelvacode%2fiso8601/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2frelvacode%2fiso8601/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2frelvacode%2fiso8601/v1.3.0/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2frelvacode%2fiso8601/v1.3.0/v1.4.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
relvacode/iso8601 (github.com/relvacode/iso8601) ### [`v1.4.0`](https://togithub.com/relvacode/iso8601/releases/tag/v1.4.0) [Compare Source](https://togithub.com/relvacode/iso8601/compare/v1.3.0...v1.4.0) ##### What's Changed - Replace ISO8061 typos with ISO8601 by [@​henrybear327](https://togithub.com/henrybear327) in [https://github.com/relvacode/iso8601/pull/17](https://togithub.com/relvacode/iso8601/pull/17) - Permit only year component in date by [@​relvacode](https://togithub.com/relvacode) in [https://github.com/relvacode/iso8601/pull/23](https://togithub.com/relvacode/iso8601/pull/23) ##### New Contributors - [@​henrybear327](https://togithub.com/henrybear327) made their first contribution in [https://github.com/relvacode/iso8601/pull/17](https://togithub.com/relvacode/iso8601/pull/17) **Full Changelog**: https://github.com/relvacode/iso8601/compare/v1.3.0...v1.4.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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](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/configschema/go.mod | 2 +- cmd/configschema/go.sum | 4 ++-- cmd/otelcontribcol/go.mod | 2 +- cmd/otelcontribcol/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- pkg/translator/azure/go.mod | 2 +- pkg/translator/azure/go.sum | 4 ++-- receiver/azureeventhubreceiver/go.mod | 2 +- receiver/azureeventhubreceiver/go.sum | 4 ++-- receiver/kafkareceiver/go.mod | 2 +- receiver/kafkareceiver/go.sum | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index b280f8bcd0ea..6ed238d06ad1 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -565,7 +565,7 @@ require ( github.com/prometheus/prometheus v0.48.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/redis/go-redis/v9 v9.4.0 // indirect - github.com/relvacode/iso8601 v1.3.0 // indirect + github.com/relvacode/iso8601 v1.4.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/cmd/configschema/go.sum b/cmd/configschema/go.sum index e24e4f1883a6..7ed93409d59f 100644 --- a/cmd/configschema/go.sum +++ b/cmd/configschema/go.sum @@ -1345,8 +1345,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index d520d6c69398..74f33aaa5158 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -593,7 +593,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/redis/go-redis/v9 v9.4.0 // indirect - github.com/relvacode/iso8601 v1.3.0 // indirect + github.com/relvacode/iso8601 v1.4.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/cmd/otelcontribcol/go.sum b/cmd/otelcontribcol/go.sum index a02943547c27..e5b3c154826e 100644 --- a/cmd/otelcontribcol/go.sum +++ b/cmd/otelcontribcol/go.sum @@ -1346,8 +1346,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/go.mod b/go.mod index 486242f6b0cb..aa33a1cbf682 100644 --- a/go.mod +++ b/go.mod @@ -564,7 +564,7 @@ require ( github.com/prometheus/prometheus v0.48.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/redis/go-redis/v9 v9.4.0 // indirect - github.com/relvacode/iso8601 v1.3.0 // indirect + github.com/relvacode/iso8601 v1.4.0 // indirect github.com/rs/cors v1.10.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/go.sum b/go.sum index ce56c096247a..b35a568b097a 100644 --- a/go.sum +++ b/go.sum @@ -1350,8 +1350,8 @@ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5X github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk= github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= -github.com/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/pkg/translator/azure/go.mod b/pkg/translator/azure/go.mod index 233912242b28..7340b220a575 100644 --- a/pkg/translator/azure/go.mod +++ b/pkg/translator/azure/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.93.0 - github.com/relvacode/iso8601 v1.3.0 + github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/collector/pdata v1.0.2-0.20240202163303-26c157e3bffb diff --git a/pkg/translator/azure/go.sum b/pkg/translator/azure/go.sum index 2f453c073ce2..6faae94d6328 100644 --- a/pkg/translator/azure/go.sum +++ b/pkg/translator/azure/go.sum @@ -38,8 +38,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/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= 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= diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index 2f90ca2d7a76..91db1f360125 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.93.0 - github.com/relvacode/iso8601 v1.3.0 + github.com/relvacode/iso8601 v1.4.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d diff --git a/receiver/azureeventhubreceiver/go.sum b/receiver/azureeventhubreceiver/go.sum index 7287092c010e..e8d94c9a76de 100644 --- a/receiver/azureeventhubreceiver/go.sum +++ b/receiver/azureeventhubreceiver/go.sum @@ -150,8 +150,8 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= -github.com/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/shirou/gopsutil/v3 v3.23.12 h1:z90NtUkp3bMtmICZKpC4+WaknU1eXtp5vtbQ11DgpE4= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index 002942747fb1..72d24ce44a94 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -70,7 +70,7 @@ require ( github.com/prometheus/common v0.46.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/relvacode/iso8601 v1.3.0 // indirect + github.com/relvacode/iso8601 v1.4.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index 2866931142a1..c9cefe722488 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -138,8 +138,8 @@ github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= 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/relvacode/iso8601 v1.3.0 h1:HguUjsGpIMh/zsTczGN3DVJFxTU/GX+MMmzcKoMO7ko= -github.com/relvacode/iso8601 v1.3.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= +github.com/relvacode/iso8601 v1.4.0 h1:GsInVSEJfkYuirYFxa80nMLbH2aydgZpIf52gYZXUJs= +github.com/relvacode/iso8601 v1.4.0/go.mod h1:FlNp+jz+TXpyRqgmM7tnzHHzBnz776kmAH2h3sZCn0I= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= From 6baae7a07301819f09bd42c340a5160e1678a555 Mon Sep 17 00:00:00 2001 From: Daniel Jaglowski Date: Fri, 2 Feb 2024 15:08:01 -0600 Subject: [PATCH 13/18] [chore][pkg/stanza] Adds a few more test cases to reader (#31022) --- .../internal/reader/factory_test.go | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/pkg/stanza/fileconsumer/internal/reader/factory_test.go b/pkg/stanza/fileconsumer/internal/reader/factory_test.go index 39f5d8403d49..4f72341b6a05 100644 --- a/pkg/stanza/fileconsumer/internal/reader/factory_test.go +++ b/pkg/stanza/fileconsumer/internal/reader/factory_test.go @@ -7,12 +7,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/encoding" "golang.org/x/text/encoding/unicode" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/attrs" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/emittest" + "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/split" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/testutil" @@ -33,6 +35,9 @@ func testFactory(t *testing.T, opts ...testFactoryOpt) (*Factory, *emittest.Sink trimFunc: trim.Whitespace, flushPeriod: defaultFlushPeriod, sinkCallBufferSize: 100, + attributes: attrs.Resolver{ + IncludeFileName: true, + }, } for _, opt := range opts { opt(cfg) @@ -99,3 +104,45 @@ func withSinkBufferSize(n int) testFactoryOpt { c.sinkCallBufferSize = n } } + +func fromEnd() testFactoryOpt { + return func(c *testFactoryCfg) { + c.fromBeginning = false + } +} + +func TestStartAt(t *testing.T) { + tempDir := t.TempDir() + temp := filetest.OpenTemp(t, tempDir) + content := "some text\n" + _, err := temp.WriteString(content) + require.NoError(t, err) + + f, _ := testFactory(t, withFingerprintSize(len(content)*2)) + fp, err := f.NewFingerprint(temp) + require.NoError(t, err) + r, err := f.NewReader(temp, fp) + require.NoError(t, err) + assert.Equal(t, int64(0), r.Offset) + + f, _ = testFactory(t, withFingerprintSize(len(content)/2), fromEnd()) + fp, err = f.NewFingerprint(temp) + require.NoError(t, err) + r, err = f.NewReader(temp, fp) + require.NoError(t, err) + assert.Equal(t, int64(len(content)), r.Offset) + + f, _ = testFactory(t, withFingerprintSize(len(content)/2)) + fp, err = f.NewFingerprint(temp) + require.NoError(t, err) + r, err = f.NewReader(temp, fp) + require.NoError(t, err) + assert.Equal(t, int64(0), r.Offset) + + f, _ = testFactory(t, withFingerprintSize(len(content)/2), fromEnd()) + fp, err = f.NewFingerprint(temp) + require.NoError(t, err) + r, err = f.NewReader(temp, fp) + require.NoError(t, err) + assert.Equal(t, int64(len(content)), r.Offset) +} From 24cfa93ba3dc56e170a2212fc608b1974635e9b5 Mon Sep 17 00:00:00 2001 From: Murphy Chen Date: Sat, 3 Feb 2024 05:23:43 +0800 Subject: [PATCH 14/18] [chore] move azuredataexpoter exporter to generated lifecycle tests (#30514) Relates to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27849 --------- Co-authored-by: Antoine Toulme --- .../generated_component_test.go | 113 ++++++++++++++++++ .../azuredataexplorerexporter/metadata.yaml | 10 +- 2 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 exporter/azuredataexplorerexporter/generated_component_test.go diff --git a/exporter/azuredataexplorerexporter/generated_component_test.go b/exporter/azuredataexplorerexporter/generated_component_test.go new file mode 100644 index 000000000000..ad0fdf341179 --- /dev/null +++ b/exporter/azuredataexplorerexporter/generated_component_test.go @@ -0,0 +1,113 @@ +// Code generated by mdatagen. DO NOT EDIT. + +package azuredataexplorerexporter + +import ( + "context" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + + "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exportertest" + + "go.opentelemetry.io/collector/confmap/confmaptest" + + "github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal/testdata" +) + +// assertNoErrorHost implements a component.Host that asserts that there were no errors. +type assertNoErrorHost struct { + component.Host + *testing.T +} + +var _ component.Host = (*assertNoErrorHost)(nil) + +func TestComponentLifecycle(t *testing.T) { + factory := NewFactory() + + tests := []struct { + name string + createFn func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) + }{ + + { + name: "logs", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateLogsExporter(ctx, set, cfg) + }, + }, + + { + name: "metrics", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateMetricsExporter(ctx, set, cfg) + }, + }, + + { + name: "traces", + createFn: func(ctx context.Context, set exporter.CreateSettings, cfg component.Config) (component.Component, error) { + return factory.CreateTracesExporter(ctx, set, cfg) + }, + }, + } + + 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, component.UnmarshalConfig(sub, cfg)) + + for _, test := range tests { + t.Run(test.name+"-shutdown", func(t *testing.T) { + c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + + t.Run(test.name+"-lifecycle", func(t *testing.T) { + + // TODO support lifecycle + t.SkipNow() + + c, err := test.createFn(context.Background(), exportertest.NewNopCreateSettings(), cfg) + require.NoError(t, err) + host := componenttest.NewNopHost() + err = c.Start(context.Background(), host) + require.NoError(t, err) + require.NotPanics(t, func() { + switch e := c.(type) { + case exporter.Logs: + logs := testdata.GenerateLogsManyLogRecordsSameResource(2) + if !e.Capabilities().MutatesData { + logs.MarkReadOnly() + } + err = e.ConsumeLogs(context.Background(), logs) + case exporter.Metrics: + metrics := testdata.GenerateMetricsTwoMetrics() + if !e.Capabilities().MutatesData { + metrics.MarkReadOnly() + } + err = e.ConsumeMetrics(context.Background(), metrics) + case exporter.Traces: + traces := testdata.GenerateTracesTwoSpansSameResource() + if !e.Capabilities().MutatesData { + traces.MarkReadOnly() + } + err = e.ConsumeTraces(context.Background(), traces) + } + }) + + require.NoError(t, err) + + err = c.Shutdown(context.Background()) + require.NoError(t, err) + }) + } +} diff --git a/exporter/azuredataexplorerexporter/metadata.yaml b/exporter/azuredataexplorerexporter/metadata.yaml index 7b7c031da4da..942b3c6ffae6 100644 --- a/exporter/azuredataexplorerexporter/metadata.yaml +++ b/exporter/azuredataexplorerexporter/metadata.yaml @@ -6,4 +6,12 @@ status: beta: [traces, metrics, logs] distributions: [contrib] codeowners: - active: [asaharn, ag-ramachandran] \ No newline at end of file + active: [asaharn, ag-ramachandran] + +tests: + config: + cluster_uri: "https://CLUSTER.kusto.windows.net" + application_id: "f80da32c-108c-415c-a19e-643f461a677a" + application_key: "xx-xx-xx-xx" + tenant_id: "21ff9e36-fbaa-43c8-98ba-00431ea10bc3" + skip_lifecycle: true \ No newline at end of file From 416f29618f868019323130acbeb6892d2b9f1bdc Mon Sep 17 00:00:00 2001 From: VihasMakwana <121151420+VihasMakwana@users.noreply.github.com> Date: Mon, 5 Feb 2024 00:07:57 +0530 Subject: [PATCH 15/18] [chore][pkg/stanza] fileconsumer: integrate recently added fileset (#30728) **Description:** Integrate recently added fileset --------- Co-authored-by: Daniel Jaglowski --- pkg/stanza/fileconsumer/config.go | 11 +- pkg/stanza/fileconsumer/file.go | 111 +++++++++--------- pkg/stanza/fileconsumer/file_other.go | 14 ++- pkg/stanza/fileconsumer/file_test.go | 5 +- pkg/stanza/fileconsumer/file_windows.go | 9 +- .../fileconsumer/internal/fileset/fileset.go | 27 ++--- .../internal/fileset/fileset_test.go | 20 ++-- receiver/filelogreceiver/go.mod | 1 + receiver/filelogreceiver/go.sum | 1 + receiver/otlpjsonfilereceiver/go.mod | 1 + receiver/otlpjsonfilereceiver/go.sum | 1 + 11 files changed, 101 insertions(+), 100 deletions(-) diff --git a/pkg/stanza/fileconsumer/config.go b/pkg/stanza/fileconsumer/config.go index e82719f698ff..18ad9d84fc38 100644 --- a/pkg/stanza/fileconsumer/config.go +++ b/pkg/stanza/fileconsumer/config.go @@ -16,6 +16,7 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/decode" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/attrs" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/emit" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fileset" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/header" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader" @@ -163,7 +164,10 @@ func (c Config) buildManager(logger *zap.SugaredLogger, emit emit.Callback, spli HeaderConfig: hCfg, DeleteAtEOF: c.DeleteAfterRead, } - + knownFiles := make([]*fileset.Fileset[*reader.Metadata], 3) + for i := 0; i < len(knownFiles); i++ { + knownFiles[i] = fileset.New[*reader.Metadata](c.MaxConcurrentFiles / 2) + } return &Manager{ SugaredLogger: logger.With("component", "fileconsumer"), readerFactory: readerFactory, @@ -171,8 +175,9 @@ func (c Config) buildManager(logger *zap.SugaredLogger, emit emit.Callback, spli pollInterval: c.PollInterval, maxBatchFiles: c.MaxConcurrentFiles / 2, maxBatches: c.MaxBatches, - previousPollFiles: make([]*reader.Reader, 0, c.MaxConcurrentFiles/2), - knownFiles: []*reader.Metadata{}, + currentPollFiles: fileset.New[*reader.Reader](c.MaxConcurrentFiles / 2), + previousPollFiles: fileset.New[*reader.Reader](c.MaxConcurrentFiles / 2), + knownFiles: knownFiles, }, nil } diff --git a/pkg/stanza/fileconsumer/file.go b/pkg/stanza/fileconsumer/file.go index 085389685017..edc4f89cb004 100644 --- a/pkg/stanza/fileconsumer/file.go +++ b/pkg/stanza/fileconsumer/file.go @@ -13,6 +13,7 @@ import ( "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/checkpoint" + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fileset" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/fingerprint" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader" "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/matcher" @@ -32,26 +33,17 @@ type Manager struct { maxBatches int maxBatchFiles int - previousPollFiles []*reader.Reader - knownFiles []*reader.Metadata - - // This value approximates the expected number of files which we will find in a single poll cycle. - // It is updated each poll cycle using a simple moving average calculation which assigns 20% weight - // to the most recent poll cycle. - // It is used to regulate the size of knownFiles. The goal is to allow knownFiles - // to contain checkpoints from a few previous poll cycles, but not grow unbounded. - movingAverageMatches int + currentPollFiles *fileset.Fileset[*reader.Reader] + previousPollFiles *fileset.Fileset[*reader.Reader] + knownFiles []*fileset.Fileset[*reader.Metadata] } func (m *Manager) Start(persister operator.Persister) error { ctx, cancel := context.WithCancel(context.Background()) m.cancel = cancel - if matches, err := m.fileMatcher.MatchFiles(); err != nil { + if _, err := m.fileMatcher.MatchFiles(); err != nil { m.Warnf("finding files: %v", err) - } else { - m.movingAverageMatches = len(matches) - m.knownFiles = make([]*reader.Metadata, 0, 4*len(matches)) } if persister != nil { @@ -63,7 +55,7 @@ func (m *Manager) Start(persister operator.Persister) error { if len(offsets) > 0 { m.Infow("Resuming from previously known offset(s). 'start_at' setting is not applicable.") m.readerFactory.FromBeginning = true - m.knownFiles = append(m.knownFiles, offsets...) + m.knownFiles[0].Add(offsets...) } } @@ -74,13 +66,18 @@ func (m *Manager) Start(persister operator.Persister) error { } func (m *Manager) closePreviousFiles() { - if len(m.knownFiles) > 4*m.movingAverageMatches { - m.knownFiles = m.knownFiles[m.movingAverageMatches:] - } - for _, r := range m.previousPollFiles { - m.knownFiles = append(m.knownFiles, r.Close()) + // m.previousPollFiles -> m.knownFiles[0] + + for r, _ := m.previousPollFiles.Pop(); r != nil; r, _ = m.previousPollFiles.Pop() { + m.knownFiles[0].Add(r.Close()) } - m.previousPollFiles = nil +} + +func (m *Manager) rotateFilesets() { + // shift the filesets at end of every consume() call + // m.knownFiles[0] -> m.knownFiles[1] -> m.knownFiles[2] + copy(m.knownFiles[1:], m.knownFiles) + m.knownFiles[0] = fileset.New[*reader.Metadata](m.maxBatchFiles / 2) } // Stop will stop the file monitoring process @@ -92,7 +89,11 @@ func (m *Manager) Stop() error { m.wg.Wait() m.closePreviousFiles() if m.persister != nil { - if err := checkpoint.Save(context.Background(), m.persister, m.knownFiles); err != nil { + checkpoints := make([]*reader.Metadata, 0, m.totalReaders()) + for _, knownFiles := range m.knownFiles { + checkpoints = append(checkpoints, knownFiles.Get()...) + } + if err := checkpoint.Save(context.Background(), m.persister, checkpoints); err != nil { m.Errorw("save offsets", zap.Error(err)) } } @@ -128,9 +129,7 @@ func (m *Manager) poll(ctx context.Context) { // Get the list of paths on disk matches, err := m.fileMatcher.MatchFiles() if err != nil { - m.Debugf("finding files: %v", err) - } else { - m.movingAverageMatches = (m.movingAverageMatches*3 + len(matches)) / 4 + m.Warnf("finding files: %v", err) } m.Debugf("matched files", zap.Strings("paths", matches)) @@ -152,26 +151,31 @@ func (m *Manager) poll(ctx context.Context) { // Any new files that appear should be consumed entirely m.readerFactory.FromBeginning = true if m.persister != nil { - allCheckpoints := make([]*reader.Metadata, 0, len(m.knownFiles)+len(m.previousPollFiles)) - allCheckpoints = append(allCheckpoints, m.knownFiles...) - for _, r := range m.previousPollFiles { + allCheckpoints := make([]*reader.Metadata, 0, m.totalReaders()) + for _, knownFiles := range m.knownFiles { + allCheckpoints = append(allCheckpoints, knownFiles.Get()...) + } + + for _, r := range m.previousPollFiles.Get() { allCheckpoints = append(allCheckpoints, r.Metadata) } if err := checkpoint.Save(context.Background(), m.persister, allCheckpoints); err != nil { m.Errorw("save offsets", zap.Error(err)) } } + // rotate at end of every poll() + m.rotateFilesets() } func (m *Manager) consume(ctx context.Context, paths []string) { m.Debug("Consuming files", zap.Strings("paths", paths)) - readers := m.makeReaders(paths) + m.makeReaders(paths) - m.preConsume(ctx, readers) + m.preConsume(ctx) // read new readers to end var wg sync.WaitGroup - for _, r := range readers { + for _, r := range m.currentPollFiles.Get() { wg.Add(1) go func(r *reader.Reader) { defer wg.Done() @@ -180,7 +184,7 @@ func (m *Manager) consume(ctx context.Context, paths []string) { } wg.Wait() - m.postConsume(readers) + m.postConsume() } func (m *Manager) makeFingerprint(path string) (*fingerprint.Fingerprint, *os.File) { @@ -211,9 +215,8 @@ func (m *Manager) makeFingerprint(path string) (*fingerprint.Fingerprint, *os.Fi // makeReader take a file path, then creates reader, // discarding any that have a duplicate fingerprint to other files that have already // been read this polling interval -func (m *Manager) makeReaders(paths []string) []*reader.Reader { - readers := make([]*reader.Reader, 0, len(paths)) -OUTER: +func (m *Manager) makeReaders(paths []string) { + m.currentPollFiles = fileset.New[*reader.Reader](m.maxBatchFiles / 2) for _, path := range paths { fp, file := m.makeFingerprint(path) if fp == nil { @@ -222,13 +225,13 @@ OUTER: // Exclude duplicate paths with the same content. This can happen when files are // being rotated with copy/truncate strategy. (After copy, prior to truncate.) - for _, r := range readers { - if fp.Equal(r.Fingerprint) { - if err := file.Close(); err != nil { - m.Debugw("problem closing file", zap.Error(err)) - } - continue OUTER + if r := m.currentPollFiles.Match(fp, fileset.Equal); r != nil { + // re-add the reader as Match() removes duplicates + m.currentPollFiles.Add(r) + if err := file.Close(); err != nil { + m.Debugw("problem closing file", zap.Error(err)) } + continue } r, err := m.newReader(file, fp) @@ -237,29 +240,19 @@ OUTER: continue } - readers = append(readers, r) + m.currentPollFiles.Add(r) } - return readers } func (m *Manager) newReader(file *os.File, fp *fingerprint.Fingerprint) (*reader.Reader, error) { // Check previous poll cycle for match - for i := 0; i < len(m.previousPollFiles); i++ { - oldReader := m.previousPollFiles[i] - if fp.StartsWith(oldReader.Fingerprint) { - // Keep the new reader and discard the old. This ensures that if the file was - // copied to another location and truncated, our handle is updated. - m.previousPollFiles = append(m.previousPollFiles[:i], m.previousPollFiles[i+1:]...) - return m.readerFactory.NewReaderFromMetadata(file, oldReader.Close()) - } + if oldReader := m.previousPollFiles.Match(fp, fileset.StartsWith); oldReader != nil { + return m.readerFactory.NewReaderFromMetadata(file, oldReader.Close()) } // Iterate backwards to match newest first - for i := len(m.knownFiles) - 1; i >= 0; i-- { - oldMetadata := m.knownFiles[i] - if fp.StartsWith(oldMetadata.Fingerprint) { - // Remove the old metadata from the list. We will keep updating it and save it again later. - m.knownFiles = append(m.knownFiles[:i], m.knownFiles[i+1:]...) + for i := 0; i < len(m.knownFiles); i++ { + if oldMetadata := m.knownFiles[i].Match(fp, fileset.StartsWith); oldMetadata != nil { return m.readerFactory.NewReaderFromMetadata(file, oldMetadata) } } @@ -268,3 +261,11 @@ func (m *Manager) newReader(file *os.File, fp *fingerprint.Fingerprint) (*reader m.Infow("Started watching file", "path", file.Name()) return m.readerFactory.NewReader(file, fp) } + +func (m *Manager) totalReaders() int { + total := m.previousPollFiles.Len() + for i := 0; i < len(m.knownFiles); i++ { + total += m.knownFiles[i].Len() + } + return total +} diff --git a/pkg/stanza/fileconsumer/file_other.go b/pkg/stanza/fileconsumer/file_other.go index 6960982801e2..cfa0c80fae09 100644 --- a/pkg/stanza/fileconsumer/file_other.go +++ b/pkg/stanza/fileconsumer/file_other.go @@ -15,11 +15,11 @@ import ( // Take care of files which disappeared from the pattern since the last poll cycle // this can mean either files which were removed, or rotated into a name not matching the pattern // we do this before reading existing files to ensure we emit older log lines before newer ones -func (m *Manager) preConsume(ctx context.Context, newReaders []*reader.Reader) { - lostReaders := make([]*reader.Reader, 0, len(m.previousPollFiles)) +func (m *Manager) preConsume(ctx context.Context) { + lostReaders := make([]*reader.Reader, 0, m.previousPollFiles.Len()) OUTER: - for _, oldReader := range m.previousPollFiles { - for _, newReader := range newReaders { + for _, oldReader := range m.previousPollFiles.Get() { + for _, newReader := range m.currentPollFiles.Get() { if newReader.Fingerprint.StartsWith(oldReader.Fingerprint) { continue OUTER } @@ -52,7 +52,9 @@ OUTER: // On non-windows platforms, we keep files open between poll cycles so that we can detect // and read "lost" files, which have been moved out of the matching pattern. -func (m *Manager) postConsume(readers []*reader.Reader) { +func (m *Manager) postConsume() { m.closePreviousFiles() - m.previousPollFiles = readers + + // m.currentPollFiles -> m.previousPollFiles + m.previousPollFiles = m.currentPollFiles } diff --git a/pkg/stanza/fileconsumer/file_test.go b/pkg/stanza/fileconsumer/file_test.go index 2e203ef1ca4d..d816089f228e 100644 --- a/pkg/stanza/fileconsumer/file_test.go +++ b/pkg/stanza/fileconsumer/file_test.go @@ -859,7 +859,6 @@ func TestFileBatchingRespectsStartAtEnd(t *testing.T) { operator, sink := testManager(t, cfg) operator.persister = testutil.NewUnscopedMockPersister() - operator.movingAverageMatches = 10 temps := make([]*os.File, 0, initFiles+moreFiles) for i := 0; i < initFiles; i++ { @@ -1144,7 +1143,7 @@ func TestDeleteAfterRead_SkipPartials(t *testing.T) { require.NoError(t, longFile.Close()) // Verify we have no checkpointed files - require.Equal(t, 0, len(operator.knownFiles)) + require.Equal(t, 0, operator.totalReaders()) // Wait until the only line in the short file and // at least one line from the long file have been consumed @@ -1286,7 +1285,7 @@ func TestStalePartialFingerprintDiscarded(t *testing.T) { operator.wg.Wait() if runtime.GOOS != "windows" { // On windows, we never keep files in previousPollFiles, so we don't expect to see them here - require.Len(t, operator.previousPollFiles, 1) + require.Equal(t, operator.previousPollFiles.Len(), 1) } // keep append data to file1 and file2 diff --git a/pkg/stanza/fileconsumer/file_windows.go b/pkg/stanza/fileconsumer/file_windows.go index 2c22b5ed4401..5481278301dd 100644 --- a/pkg/stanza/fileconsumer/file_windows.go +++ b/pkg/stanza/fileconsumer/file_windows.go @@ -7,15 +7,14 @@ package fileconsumer // import "github.com/open-telemetry/opentelemetry-collecto import ( "context" - - "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza/fileconsumer/internal/reader" ) -func (m *Manager) preConsume(_ context.Context, _ []*reader.Reader) { +func (m *Manager) preConsume(ctx context.Context) { } // On windows, we close files immediately after reading because they cannot be moved while open. -func (m *Manager) postConsume(readers []*reader.Reader) { - m.previousPollFiles = readers +func (m *Manager) postConsume() { + // m.currentPollFiles -> m.previousPollFiles + m.previousPollFiles = m.currentPollFiles m.closePreviousFiles() } diff --git a/pkg/stanza/fileconsumer/internal/fileset/fileset.go b/pkg/stanza/fileconsumer/internal/fileset/fileset.go index ead43a717ce6..3d1cf50fb143 100644 --- a/pkg/stanza/fileconsumer/internal/fileset/fileset.go +++ b/pkg/stanza/fileconsumer/internal/fileset/fileset.go @@ -55,27 +55,22 @@ func (set *Fileset[T]) Add(readers ...T) { set.readers = append(set.readers, readers...) } -func (set *Fileset[T]) Clear() { - // clear the underlying readers - set.readers = make([]T, 0, cap(set.readers)) -} - -func (set *Fileset[T]) Reset(readers ...T) []T { - // empty the underlying set and return the old array - arr := make([]T, len(set.readers)) - copy(arr, set.readers) - set.Clear() - set.readers = append(set.readers, readers...) - return arr -} - -func (set *Fileset[T]) Match(fp *fingerprint.Fingerprint) T { +func (set *Fileset[T]) Match(fp *fingerprint.Fingerprint, cmp func(a, b *fingerprint.Fingerprint) bool) T { var val T for idx, r := range set.readers { - if fp.StartsWith(r.GetFingerprint()) { + if cmp(fp, r.GetFingerprint()) { set.readers = append(set.readers[:idx], set.readers[idx+1:]...) return r } } return val } + +// comparators +func StartsWith(a, b *fingerprint.Fingerprint) bool { + return a.StartsWith(b) +} + +func Equal(a, b *fingerprint.Fingerprint) bool { + return a.Equal(b) +} diff --git a/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go b/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go index 9e6d9269a4cb..878791569f86 100644 --- a/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go +++ b/pkg/stanza/fileconsumer/internal/fileset/fileset_test.go @@ -32,27 +32,22 @@ func push[T Matchable](ele ...T) func(t *testing.T, fileset *Fileset[T]) { func pop[T Matchable](expectedErr error, expectedElemet T) func(t *testing.T, fileset *Fileset[T]) { return func(t *testing.T, fileset *Fileset[T]) { + pr := fileset.Len() el, err := fileset.Pop() if expectedErr == nil { require.NoError(t, err) require.Equal(t, el, expectedElemet) + require.Equal(t, pr-1, fileset.Len()) } else { require.ErrorIs(t, err, expectedErr) } } } -func reset[T Matchable](ele ...T) func(t *testing.T, fileset *Fileset[T]) { - return func(t *testing.T, fileset *Fileset[T]) { - fileset.Reset(ele...) - require.Equal(t, fileset.Len(), len(ele)) - } -} - func match[T Matchable](ele T, expect bool) func(t *testing.T, fileset *Fileset[T]) { return func(t *testing.T, fileset *Fileset[T]) { pr := fileset.Len() - r := fileset.Match(ele.GetFingerprint()) + r := fileset.Match(ele.GetFingerprint(), StartsWith) if expect { require.NotNil(t, r) require.Equal(t, pr-1, fileset.Len()) @@ -90,12 +85,13 @@ func TestFilesetReader(t *testing.T) { // match() removes the matched item and returns it match(newReader([]byte("ABCDEFGHI")), true), - match(newReader([]byte("ABCEFGHI")), false), + match(newReader([]byte("ABCDEFGHI")), false), - reset(newReader([]byte("XYZ"))), + push(newReader([]byte("XYZ"))), match(newReader([]byte("ABCDEF")), false), - match(newReader([]byte("QWERT")), false), + match(newReader([]byte("QWERT")), true), // should still be present match(newReader([]byte("XYZabc")), true), + pop(errFilesetEmpty, newReader([]byte(""))), }, }, { @@ -106,7 +102,7 @@ func TestFilesetReader(t *testing.T) { pop(nil, newReader([]byte("QWERT"))), pop(errFilesetEmpty, newReader([]byte(""))), - reset(newReader([]byte("XYZ"))), + push(newReader([]byte("XYZ"))), pop(nil, newReader([]byte("XYZ"))), pop(errFilesetEmpty, newReader([]byte(""))), }, diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 1445cc712830..e485d8e449b4 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -57,6 +57,7 @@ require ( go.opentelemetry.io/otel/sdk v1.22.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect + golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index f64eb2fd729f..fe66e96e87e8 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -120,6 +120,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= +golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= diff --git a/receiver/otlpjsonfilereceiver/go.mod b/receiver/otlpjsonfilereceiver/go.mod index 795abc23c976..e00d734e5ef2 100644 --- a/receiver/otlpjsonfilereceiver/go.mod +++ b/receiver/otlpjsonfilereceiver/go.mod @@ -55,6 +55,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.22.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect + golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 // indirect golang.org/x/net v0.20.0 // indirect golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/receiver/otlpjsonfilereceiver/go.sum b/receiver/otlpjsonfilereceiver/go.sum index 46a35c197ecb..74c1dc0a6589 100644 --- a/receiver/otlpjsonfilereceiver/go.sum +++ b/receiver/otlpjsonfilereceiver/go.sum @@ -118,6 +118,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20230711023510-fffb14384f22 h1:FqrVOBQxQ8r/UwwXibI0KMolVhvFiGobSfdE33deHJM= +golang.org/x/exp v0.0.0-20230711023510-fffb14384f22/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= From bd8962d80b8912066ea3b257677f697d47fd1482 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Mon, 5 Feb 2024 01:33:56 -0800 Subject: [PATCH 16/18] [chore] make telemetrygen build faster (#30989) Fixes #30933 --- .github/workflows/telemetrygen.yml | 64 ++++++++++++++++++++++++++++++ Makefile | 5 ++- cmd/telemetrygen/Dockerfile | 12 ++---- cmd/telemetrygen/README.md | 10 +++++ 4 files changed, 82 insertions(+), 9 deletions(-) diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml index 0286ce6c27c2..25e798ba9d6b 100644 --- a/.github/workflows/telemetrygen.yml +++ b/.github/workflows/telemetrygen.yml @@ -5,6 +5,10 @@ on: tags: - 'v[0-9]+.[0-9]+.[0-9]+*' pull_request: +env: + # Make sure to exit early if cache segment download times out after 2 minutes. + # We limit cache download as a whole to 5 minutes. + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616 concurrency: @@ -17,10 +21,30 @@ jobs: if: ${{ github.actor != 'dependabot[bot]' }} steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: ~1.20.12 + cache: false + - name: Cache Go + id: go-cache + timeout-minutes: 5 + uses: actions/cache@v3 + with: + path: | + ~/go/bin + ~/go/pkg/mod + key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Build binaries + run: | + GOOS=linux GOARCH=ppc64le make telemetrygen + GOOS=linux GOARCH=arm64 make telemetrygen + GOOS=linux GOARCH=amd64 make telemetrygen + GOOS=linux GOARCH=s390x make telemetrygen + cp bin/telemetrygen_* cmd/telemetrygen/ - name: Build telemetrygen uses: docker/build-push-action@v5 with: @@ -36,6 +60,19 @@ jobs: packages: write steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: ~1.20.12 + cache: false + - name: Cache Go + id: go-cache + timeout-minutes: 5 + uses: actions/cache@v3 + with: + path: | + ~/go/bin + ~/go/pkg/mod + key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -46,6 +83,13 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Build binaries + run: | + GOOS=linux GOARCH=ppc64le make telemetrygen + GOOS=linux GOARCH=arm64 make telemetrygen + GOOS=linux GOARCH=amd64 make telemetrygen + GOOS=linux GOARCH=s390x make telemetrygen + cp bin/telemetrygen_* cmd/telemetrygen/ - name: Push telemetrygen to Github packages uses: docker/build-push-action@v5 with: @@ -61,6 +105,19 @@ jobs: packages: write steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: ~1.20.12 + cache: false + - name: Cache Go + id: go-cache + timeout-minutes: 5 + uses: actions/cache@v3 + with: + path: | + ~/go/bin + ~/go/pkg/mod + key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }} - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -74,6 +131,13 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Build binaries + run: | + GOOS=linux GOARCH=ppc64le make telemetrygen + GOOS=linux GOARCH=arm64 make telemetrygen + GOOS=linux GOARCH=amd64 make telemetrygen + GOOS=linux GOARCH=s390x make telemetrygen + cp bin/telemetrygen_* cmd/telemetrygen/ - name: Push telemetrygen to Github packages uses: docker/build-push-action@v5 with: diff --git a/Makefile b/Makefile index 72b37602340b..f5f38a9af5ac 100644 --- a/Makefile +++ b/Makefile @@ -250,7 +250,10 @@ docker-otelcontribcol: .PHONY: docker-telemetrygen docker-telemetrygen: - COMPONENT=telemetrygen $(MAKE) docker-component + GOOS=linux GOARCH=$(GOARCH) $(MAKE) telemetrygen + cp bin/telemetrygen_* cmd/telemetrygen/ + cd cmd/telemetrygen && docker build --platform linux/$(GOARCH) -t telemetrygen:latest . + rm cmd/telemetrygen/telemetrygen_* .PHONY: generate generate: install-tools diff --git a/cmd/telemetrygen/Dockerfile b/cmd/telemetrygen/Dockerfile index a1117f6c1097..ba1d577e41b4 100644 --- a/cmd/telemetrygen/Dockerfile +++ b/cmd/telemetrygen/Dockerfile @@ -1,10 +1,3 @@ -FROM golang:1.21 AS build - -WORKDIR /src -ADD . /src - -RUN CGO_ENABLED=0 go build -o /telemetrygen - FROM alpine:latest as certs RUN apk --update add ca-certificates @@ -13,7 +6,10 @@ FROM scratch ARG USER_UID=10001 USER ${USER_UID} +ARG TARGETOS +ARG TARGETARCH + COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=build /telemetrygen /telemetrygen +COPY ./telemetrygen_${TARGETOS}_${TARGETARCH} /telemetrygen ENTRYPOINT ["/telemetrygen"] diff --git a/cmd/telemetrygen/README.md b/cmd/telemetrygen/README.md index 71b7a8026852..58d2b8d5a8d0 100644 --- a/cmd/telemetrygen/README.md +++ b/cmd/telemetrygen/README.md @@ -24,6 +24,16 @@ go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemet Check the [`go install` reference](https://go.dev/ref/mod#go-install) to install specific versions. +### Docker build + +You can build locally the Docker image with: + +```bash +make docker-telemetrygen +``` + +Using github actions, we also push a docker image on commit to main or on release to this [Github docker registry](https://github.com/open-telemetry/opentelemetry-collector-contrib/pkgs/container/opentelemetry-collector-contrib%2Ftelemetrygen). + ## Running First, you'll need an OpenTelemetry Collector to receive the telemetry data. Follow the project's instructions for a detailed setting up guide. The following configuration file should be sufficient: From 3efff46e2a698d25805b1139b8770dc1f7dc3d61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 10:39:08 +0100 Subject: [PATCH 17/18] fix(deps): update module github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal to v0.93.0 (#30877) 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/internal/coreinternal](https://togithub.com/open-telemetry/opentelemetry-collector-contrib) | `v0.92.0` -> `v0.93.0` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fopen-telemetry%2fopentelemetry-collector-contrib%2finternal%2fcoreinternal/v0.93.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%2finternal%2fcoreinternal/v0.93.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%2finternal%2fcoreinternal/v0.92.0/v0.93.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%2finternal%2fcoreinternal/v0.92.0/v0.93.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
open-telemetry/opentelemetry-collector-contrib (github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal) ### [`v0.93.0`](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/blob/HEAD/CHANGELOG.md#v0930) [Compare Source](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.92.0...v0.93.0) ##### 🛑 Breaking changes 🛑 - `azuremonitorexporter`: Fixed an issue where span attributes with double and int values were incorrectly added to the `measurements` field in the Application Insights schema. These attributes are now correctly placed in the `properties` field. ([#​29683](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29683)) - `vcenterreceiver`: Bump "receiver.vcenter.emitPerfMetricsWithObjects" feature gate ([#​30615](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30615)) - `docker`: Adopt api_version as strings to correct invalid float truncation ([#​24025](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/24025)) - `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 enabled by default. See the File Storage extension's README for details. - `postgresqlreceiver`: add schema attribute to postgresqlreceiver ([#​29559](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29559)) Adds a new resource attribute to the PSQL receiver to store the schema of the table or index Existing table attributes are adjusted to not include the schema, which was inconsistently used ##### 🚩 Deprecations 🚩 - `mdatagen`: Deprecate mdatagen in preparation for its move to opentelemetry-collector ([#​30497](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30497)) ##### 🚀 New components 🚀 - `solarwindsapmsettingsextension`: added configuration and readme ([#​27668](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/27668)) - `alertmanagerexporter`: Add Alertmanager exporter to builder config ([#​23569](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/23569)) - `otelarrow`: Skeleton of new OpenTelemetry Protocol with Apache Arrow Exporter. ([#​26491](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/26491)) - `osqueryreceiver`: Adds osquery receiver skeleton ([#​30375](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30375)) ##### 💡 Enhancements 💡 - `pkg/stanza`: Add a json array parser operator and an assign keys transformer. ([#​30321](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30321)) Json array parser opreator can be used to parse a json array string input into a list of objects. | Assign keys transformer can be used to assigns keys from the configuration to an input list - `splunkhecexporter`: Batch data according to access token and index, if present. ([#​30404](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30404)) - `awscloudwatchlogsexporter`: Add instrumentation scope in log records exported to CloudWatch logs ([#​30316](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30316), [#​29884](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29884)) - `cassandraexporter`: added authorization by username and password ([#​27827](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/27827)) - `lokiexporter`: migrate metrics to use OpenTelemetry ([#​30170](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30170)) - `cmd/telemetrygen`: This updates telemetrygen to create multiple child spans per trace and enhances the tool's functionality for load testing the remote tracing backend. ([#​30687](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30687)) - `cmd/telemetrygen`: This updates telemetrygen with TLS/mTLS options to test the security of telemetry ingestion services and infrastructure for secure communication. To illustrate the usage, a new example, secure-tracing is added to examples collection. ([#​29681](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29681)) - `k8sattributesprocessor`: Apply lifecycle tests to k8sprocessor, change its behavior to report fatal error ([#​30387](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30387)) - `k8sclusterreceiver`: add new disabled os.description, k8s.container_runtime.version resource attributes ([#​30342](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30342)) - `k8sclusterreceiver`: add os.type resource attribute ([#​30342](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30342)) - `kubeletstatsreceiver`: Add new `*.cpu.usage` metrics. ([#​25901](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/25901)) - `oidcauthextension`: Move validation logic outside of the extension creation, to the configuration validation ([#​30460](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30460)) - `datadogexporter`: Add support for setting host tags via host metadata. ([#​30680](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30680)) When the `datadog.host.use_as_metadata` resource attribute is set to `true`: - Nonempty string-value resource attributes starting with `datadog.host.tag.` will be added as host tags for the host associated with the resource. - deployment.environment and k8s.cluster.name as mapped to Datadog names and added as host tags for the host associated with the resource. - `opensearchexporter`: added opensearch exporter to the contrib distribution metadata ([#​30183](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30183)) - `pkg/ottl`: Add `flatten` function for flattening maps ([#​30455](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30455)) - `redisreciever`: adds metric for slave_repl_offset ([#​6942](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/6942)) also adds a shell script to set up docker-compose integration test - `exporter/datadogexporter`: Add kafka metrics mapping. This allows users of the JMX Receiver/JMX Metrics Gatherer and kafka metrics receiver to have access to the OOTB kafka Dashboard. ([#​30731](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30731)) - `receiver/sqlquery`: Add debug log when running SQL query ([#​29672](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/29672)) - `cmd/opampsupervisor`: Use a bootstrapping flow to get the Collector's agent description. ([#​21071](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/21071)) ##### 🧰 Bug fixes 🧰 - `receiver/filelog`: fix panic after upgrading from v0.71.0 when using storage ([#​30235](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30235)) - `clickhouseexporter`: Fix clickhouse exporter insert metrics data bug ([#​30210](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30210)) - `prometheusremotewriteexporter`: Check if the context was canceled by a timeout in the component level to avoid unnecessary retries. ([#​30308](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30308)) - `elasticsearchreceifver`: Fix nil panic on non-linux systems ([#​30140](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30140)) - `kafkareceiver`: The Kafka receiver now exports some partition-specific metrics per-partition, with a `partition` tag ([#​30177](https://togithub.com/open-telemetry/opentelemetry-collector-contrib/issues/30177)) The following metrics now render per partition: - kafka_receiver_messages - kafka_receiver_current_offset - kafka_receiver_offset_lag
--- ### 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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/open-telemetry/opentelemetry-collector-contrib). Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- processor/intervalprocessor/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processor/intervalprocessor/go.mod b/processor/intervalprocessor/go.mod index ffe966cc408d..545b7b9dbe5d 100644 --- a/processor/intervalprocessor/go.mod +++ b/processor/intervalprocessor/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/processor/inter go 1.20 require ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/stretchr/testify v1.8.4 go.opentelemetry.io/collector/component v0.93.1-0.20240202170612-7abb9622312d go.opentelemetry.io/collector/confmap v0.93.1-0.20240202170612-7abb9622312d From 517b50c0b6734e74f9c01f9872edde0c0d949ea5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:08:09 +0100 Subject: [PATCH 18/18] fix(deps): update module github.com/klauspost/compress to v1.17.5 (#30855) 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/klauspost/compress](https://togithub.com/klauspost/compress) | `v1.17.4` -> `v1.17.5` | [![age](https://developer.mend.io/api/mc/badges/age/go/github.com%2fklauspost%2fcompress/v1.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/go/github.com%2fklauspost%2fcompress/v1.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/go/github.com%2fklauspost%2fcompress/v1.17.4/v1.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/go/github.com%2fklauspost%2fcompress/v1.17.4/v1.17.5?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
klauspost/compress (github.com/klauspost/compress) ### [`v1.17.5`](https://togithub.com/klauspost/compress/releases/tag/v1.17.5) [Compare Source](https://togithub.com/klauspost/compress/compare/v1.17.4...v1.17.5) #### What's Changed - flate: Fix reset with dictionary on custom window encodes by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/912](https://togithub.com/klauspost/compress/pull/912) - zstd: Limit better/best default window to 8MB by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/913](https://togithub.com/klauspost/compress/pull/913) - zstd: Shorter and faster asm for decSymbol.newState by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/896](https://togithub.com/klauspost/compress/pull/896) - zstd: Add Frame header encoding and stripping by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/908](https://togithub.com/klauspost/compress/pull/908) - zstd: Tweak noasm FSE decoder by [@​greatroar](https://togithub.com/greatroar) in [https://github.com/klauspost/compress/pull/910](https://togithub.com/klauspost/compress/pull/910) - s2: Fix callbacks for skippable blocks and disallow 0xfe (Padding) for custom use by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/916](https://togithub.com/klauspost/compress/pull/916) - s2: Fix incorrect length encoded by writer.AddSkippableBlock by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/917](https://togithub.com/klauspost/compress/pull/917) - s2: Fix up AddSkippableBlock more by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/919](https://togithub.com/klauspost/compress/pull/919) - s2: Document and test how to peek the stream for skippable blocks by [@​Jille](https://togithub.com/Jille) in [https://github.com/klauspost/compress/pull/918](https://togithub.com/klauspost/compress/pull/918) - internal/race,s2: add some race instrumentation by [@​egonelbre](https://togithub.com/egonelbre) in [https://github.com/klauspost/compress/pull/903](https://togithub.com/klauspost/compress/pull/903) - build(deps): bump the github-actions group with 4 updates by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/klauspost/compress/pull/900](https://togithub.com/klauspost/compress/pull/900) - CI: Hash pin sensitive actions and configure Dependabot to automatically update them by [@​diogoteles08](https://togithub.com/diogoteles08) in [https://github.com/klauspost/compress/pull/899](https://togithub.com/klauspost/compress/pull/899) - Update generator and executable go.mod by [@​klauspost](https://togithub.com/klauspost) in [https://github.com/klauspost/compress/pull/904](https://togithub.com/klauspost/compress/pull/904) - Update README.md by [@​pelenium](https://togithub.com/pelenium) in [https://github.com/klauspost/compress/pull/905](https://togithub.com/klauspost/compress/pull/905) - build(deps): bump the github-actions group with 1 update by [@​dependabot](https://togithub.com/dependabot) in [https://github.com/klauspost/compress/pull/906](https://togithub.com/klauspost/compress/pull/906) #### New Contributors - [@​pelenium](https://togithub.com/pelenium) made their first contribution in [https://github.com/klauspost/compress/pull/905](https://togithub.com/klauspost/compress/pull/905) - [@​Jille](https://togithub.com/Jille) made their first contribution in [https://github.com/klauspost/compress/pull/916](https://togithub.com/klauspost/compress/pull/916) **Full Changelog**: https://github.com/klauspost/compress/compare/v1.17.4...v1.17.5
--- ### 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 has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](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/fileexporter/go.mod | 2 +- exporter/fileexporter/go.sum | 4 ++-- exporter/sapmexporter/go.mod | 2 +- exporter/sapmexporter/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index bc5df36cf660..1313bc1443aa 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileex go 1.20 require ( - github.com/klauspost/compress v1.17.4 + github.com/klauspost/compress v1.17.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 github.com/stretchr/testify v1.8.4 diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index 429b24d4f20a..6ab2fca9c106 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -24,8 +24,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= 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= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index bde3c6932851..1204488de0e9 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/cenkalti/backoff/v4 v4.2.1 github.com/jaegertracing/jaeger v1.53.0 - github.com/klauspost/compress v1.17.4 + github.com/klauspost/compress v1.17.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.93.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.93.0 diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 189b25320995..966a19f081b0 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -60,8 +60,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= -github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.5 h1:d4vBd+7CHydUqpFBgUEKkSdtSugf9YFmSkvUYPquI5E= +github.com/klauspost/compress v1.17.5/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= 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=